Author Topic: Patches to compile and link C::B against wxWidgets 2.8.0  (Read 87328 times)

Offline Game_Ender

  • Lives here!
  • ****
  • Posts: 551
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #60 on: December 19, 2006, 11:01:34 pm »
Have you tried setting svn:eol-style property to native?  You should really have your SVN client set to automatically set that property (along with the mime type) on every file you add.  When the property is set, subversion will make sure the eol style markers are just right.

Offtopic:
Many helpful little SVN tidbits are buried in that book.  Code::Blocks would probably be helped by using the vendor branches.  Which would allow us to easily maintain custom versions of projects we depend on.
« Last Edit: December 19, 2006, 11:10:33 pm by Game_Ender »

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7582
    • My Best Post
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #61 on: December 19, 2006, 11:09:14 pm »
Have you tried setting svn:eol-style property to native?  You should really have your SVN client set to automatically set that property (along with the mime type) on every file you add.  When the property is set, subversion will make sure the eol style markers are just right.

Offtopic:
Many helpful little SVN tidbits are baried in that book.  Code::Blocks would probably be helped by using the vendor branches.  Which would allow us to easily maintain custom versions of projects we depend on.

That types of things only help if the file has only one type of line endings this file has Mac and Native endings. I can fix only if I have write access. Tim S

Edit: I know how to fix this in CVS when I have write access, but since it is SVN and no write access. I can only fix the file each time myself. This means each time the file is edited I have to do manual work on the diff/patch file.

Note: I do agree svn:eol-style property to native is the correct thing to do, but I can NOT do it on the server. I can only do it on my machine which does NOT fix the issue of the server copy being damaged because svn:eol-style property was not set to native when someone edited in an old Mac setup.
« Last Edit: December 19, 2006, 11:14:20 pm by stahta01 »
C Programmer working to learn more about C++ and Git.
On Windows 7 64 bit and Windows 10 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline Game_Ender

  • Lives here!
  • ****
  • Posts: 551
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #62 on: December 19, 2006, 11:13:15 pm »
Just did a little research, its odd that it fails on mixed line endings.  Probably a pretection to keep you from setting it for binary files.

Offline Pecan

  • Plugin developer
  • Lives here!
  • ****
  • Posts: 2750
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #63 on: December 19, 2006, 11:29:09 pm »
I edited the source you liked to in order to make an dos2mac command

I then ran the below commands and it looks to fix the problem.

dos2mac *.cpp
mac2unix *.cpp
unix2dos *.cpp

svn propset eol-style native *.cpp

Tim S

Uploaded the changed source to http://www.savefile.com/projects/1039215
pick DOS2UNIX.zip


where do you put
Code
svn propset eol-style native *.cpp

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7582
    • My Best Post
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #64 on: December 19, 2006, 11:29:39 pm »
Just did a little research, its odd that it fails on mixed line endings.  Probably a pretection to keep you from setting it for binary files.

SVN diff works it just produces garbage that I have to hand edit each time.
This is with this command.
svn.exe diff --extensions --unified=1 --extensions --ignore-eol-style > filename-unix.patch

The following command what's to remove nearly all the lines and then readd them with new line endings
svn.exe diff > filename-unix2.patch

Tim S

C Programmer working to learn more about C++ and Git.
On Windows 7 64 bit and Windows 10 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7582
    • My Best Post
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #65 on: December 19, 2006, 11:33:58 pm »
I edited the source you liked to in order to make an dos2mac command

I then ran the below commands and it looks to fix the problem.

dos2mac *.cpp
mac2unix *.cpp
unix2dos *.cpp

svn propset eol-style native *.cpp

Tim S

Uploaded the changed source to http://www.savefile.com/projects/1039215
pick DOS2UNIX.zip


where do you put
Code
svn propset eol-style native *.cpp


I just run it on the command line in the directory with the problem.

You can leave it out, but using it should prevent this problem from happening again on this file.

As long as you commit the changes it should fix my issue, svn propset eol-style native *.cpp just sets the file to native line endings so the next Mac person or DOS person can't damage the line ending without a lot of work.

The above command my require the new version of SVN to work. I am using 1.4.2 I never noticed it till 1.4 version was installed.
« Last Edit: December 19, 2006, 11:37:58 pm by stahta01 »
C Programmer working to learn more about C++ and Git.
On Windows 7 64 bit and Windows 10 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline Pecan

  • Plugin developer
  • Lives here!
  • ****
  • Posts: 2750
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #66 on: December 19, 2006, 11:59:00 pm »
I edited the source you liked to in order to make an dos2mac command

I then ran the below commands and it looks to fix the problem.

dos2mac *.cpp
mac2unix *.cpp
unix2dos *.cpp

svn propset eol-style native *.cpp

Tim S

Uploaded the changed source to http://www.savefile.com/projects/1039215
pick DOS2UNIX.zip


SVN 3401:

-KeyBinder 1.0.9 2006/12/19
-Set all EOL to dos ala TimS instructions & svn propset eol-style native *.h and *.cpp (Thanks Tim)
« Last Edit: December 20, 2006, 12:01:27 am by Pecan »

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7582
    • My Best Post
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #67 on: December 20, 2006, 12:12:29 am »
SVN 3401:

-KeyBinder 1.0.9 2006/12/19
-Set all EOL to dos ala TimS instructions & svn propset eol-style native *.h and *.cpp (Thanks Tim)

Thanks, The following command no longer outputs garbage where it used to before.

svn.exe diff --extensions --unified=1 --extensions --ignore-eol-style > filename-unix.patch

Tim S
C Programmer working to learn more about C++ and Git.
On Windows 7 64 bit and Windows 10 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline heromyth

  • Multiple posting newcomer
  • *
  • Posts: 98
    • http://
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #68 on: December 20, 2006, 03:25:22 am »
first of all, let's see what wx 2.8 brings . Will it fix some of the bugs we are suffering from the 2.6, if yes, then it light be interesting to use 2.8. If not, then might be best to wait.

That's great. It seems that  we can do with TinyXML, wxScintilla, wxPropertyGrid and wxFlatNotebook etc. in the same way.

Using wx 2.8, we may remove wxAui from CB SVN :lol:
« Last Edit: December 20, 2006, 03:39:19 am by heromyth »

Offline David Perfors

  • Developer
  • Lives here!
  • *****
  • Posts: 560
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #69 on: December 20, 2006, 07:35:55 am »
No we may not (yet) :P. We have to support wx 2.6 for some time, until we don't support it anymore we have to use the version in svn.
OS: winXP
Compiler: mingw
IDE: Code::Blocks SVN WX: 2.8.4 Wish list: faster code completion, easier debugging, refactoring

Offline Game_Ender

  • Lives here!
  • ****
  • Posts: 551
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #70 on: December 20, 2006, 07:38:34 am »
Hmm, can it be updated to the one currently in 2.8, the 2.8 wxAUI has the wxAUI notebook which gives you some level of tearable tabs.

Offline David Perfors

  • Developer
  • Lives here!
  • *****
  • Posts: 560
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #71 on: December 20, 2006, 07:40:05 am »
It is possible to try it... ;) Those tabs are really amazing.

Aren't the toolbars new as well?
OS: winXP
Compiler: mingw
IDE: Code::Blocks SVN WX: 2.8.4 Wish list: faster code completion, easier debugging, refactoring

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7582
    • My Best Post
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #72 on: December 20, 2006, 07:48:39 am »
Hmm, can it be updated to the one currently in 2.8, the 2.8 wxAUI has the wxAUI notebook which gives you some level of tearable tabs.

[ Patch #1730 ] wxaui patch for wxWidgets 2.8 Submitted By: stahta01 based on afb work.
   https://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=1730&group_id=5358

The above patch changes it to using the wxaui in wxWidgets 2.8, if I understand it correctly afb wrote it and I just modified it for the release version of 2.8.0.

Tim S
« Last Edit: December 20, 2006, 08:04:04 am by stahta01 »
C Programmer working to learn more about C++ and Git.
On Windows 7 64 bit and Windows 10 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

sethjackson

  • Guest
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #73 on: December 20, 2006, 02:33:24 pm »
Hmm, can it be updated to the one currently in 2.8, the 2.8 wxAUI has the wxAUI notebook which gives you some level of tearable tabs.

Tearable tabs? How?

It is possible to try it... ;) Those tabs are really amazing.

Aren't the toolbars new as well?

Yeah the tabs are kewl. :)

New toolbars? Hmm didn't see that......... It would be kewl if we had a wxAuiToolbar or something..

Offline Game_Ender

  • Lives here!
  • ****
  • Posts: 551
Re: Patches to compile and link C::B against wxWidgets 2.8.0
« Reply #74 on: December 20, 2006, 03:46:38 pm »
The quickest way to see it is to download wxPython 2.8 and its demos.  There is a new wxAUI class called wxAUINotebook (wxWidgets needs to learn namespaces).  Basically every frame becomes a notebook and you can move them between panes, or "tear" one out and create its own pane.  The only thing they don't do currently is become floating windows.  That for later releases.