Code::Blocks Forums

Developer forums (C::B DEVELOPMENT STRICTLY!) => Development => Topic started by: stahta01 on October 13, 2014, 05:50:02 pm

Title: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 13, 2014, 05:50:02 pm
FYI:

oBFusCATed, you had NOT been applying my changes in
https://github.com/stahta01/codeblocks_sf_tims/tree/for_upstream (https://github.com/stahta01/codeblocks_sf_tims/tree/for_upstream)
So, I decided that you did NOT like the changes moved those old changes to
https://github.com/stahta01/codeblocks_sf_tims/tree/old_for_upstream (https://github.com/stahta01/codeblocks_sf_tims/tree/old_for_upstream)

I reset hard for_upstream and added 3 changes to it.

1. Location fix for VirtualBuildTargetsDlg.wxs related files it is now in src folder; but, no one updated it from the old sdk location.
2. Core app & plugins contains sdk which I consider wrong; do you agree?
    And, it is missing Abbreviations.
3. The Windows CB projects Addr2LineUI uses WX_VER instead of WX_VERSION

I am now retesting these changes with Windows 7 32 bit.
I never tested the changes with any NON windows OSes.

Tim S.
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: oBFusCATed on October 13, 2014, 08:50:26 pm
I'm not following your branches and I'll review and apply patches only if I'm ask to do so.

So if you have a patch you think it is ready for push - start a topic or post in one of your older topics about it.
If I don't answer within a week post a reminder message.

Sorry if there is some misunderstanding.
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: oBFusCATed on October 13, 2014, 08:58:55 pm
Quote from: stahta01 on October 13, 2014, 05:50:02 pm
2. Core app & plugins contains sdk which I consider wrong; do you agree?
    And, it is missing Abbreviations.
I'm not really sure what is the correct setup here.
I've never used or seen it, so I can't comment much what its purpose is.
Morten and others do you know the original idea behind this target?
Title: Re: AW: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: MortenMacFly on October 13, 2014, 10:00:57 pm
Quote from: oBFusCATed on October 13, 2014, 08:58:55 pm
Quote from: stahta01 on October 13, 2014, 05:50:02 pm
2. Core app & plugins contains sdk which I consider wrong; do you agree?
    And, it is missing Abbreviations.
I'm not really sure what is the correct setup here.
I've never used or seen it, so I can't comment much what its purpose is.
Morten and others do you know the original idea behind this target?
Sorry but I don't understand what that means...Surely core and apps and plugins need the sdk....
?????
Title: Re: AW: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 15, 2014, 03:25:41 am
Quote from: MortenMacFly on October 13, 2014, 10:00:57 pm
Quote from: oBFusCATed on October 13, 2014, 08:58:55 pm
Quote from: stahta01 on October 13, 2014, 05:50:02 pm
2. Core app & plugins contains sdk which I consider wrong; do you agree?
    And, it is missing Abbreviations.
I'm not really sure what is the correct setup here.
I've never used or seen it, so I can't comment much what its purpose is.
Morten and others do you know the original idea behind this target?
Sorry but I don't understand what that means...Surely core and apps and plugins need the sdk....
?????

The core app also need the third party libs that are NOT part of that virtual target.

My use case of the changed
1. Build/rebuild "third party libs"
2. Build/rebuild sdk
3. Build/rebuild "Core app & plugins"

NOTE: I am using Git under windows this result in very slow builds of the SDK because of "git svn info" takes a minute to 5 minutes to work.

Tim S.


Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 23, 2014, 07:16:00 pm
Removed the change to "Core app & plugins" Virtual Target.
If someone still want to apply it; moved it to this branch
https://github.com/stahta01/codeblocks_sf_tims/tree/build/rejectedPatches (https://github.com/stahta01/codeblocks_sf_tims/tree/build/rejectedPatches)
I am guessing that this patch only makes sense to Git Windows users; because the main gain is it is slightly faster re-build CB using it.


I now have 6 commits for consideration in branch https://github.com/stahta01/codeblocks_sf_tims/tree/for_upstream (https://github.com/stahta01/codeblocks_sf_tims/tree/for_upstream)

The first 3 are PCH usage related.
Next 3 are CB core project missing file related.

Tim S.
Title: Re:
Post by: MortenMacFly on October 23, 2014, 07:21:44 pm
I would like to highlight the fact that besides you've been told so not all devs use git and can make use of these patches that way... It may not be clear to all... So hopefully obf will pick it up as he is the one using git most intensively...
Title: Re:
Post by: stahta01 on October 24, 2014, 12:55:25 am
Quote from: MortenMacFly on October 23, 2014, 07:21:44 pm
I would like to highlight the fact that besides you've been told so not all devs use git and can make use of these patches that way... It may not be clear to all... So hopefully obf will pick it up as he is the one using git most intensively...

I have many SVN patches, also; But, I have gotten the best result using Git and Obfuscated.

Link to 4 SVN patches; that I plan to re-test next. Plan to wait a week then add them to my Git up_stream branch.
https://github.com/stahta01/cb_misc/blob/master/Patches/svn/CB_project_bug_04_remove_wxscintilla_cb.patch (https://github.com/stahta01/cb_misc/blob/master/Patches/svn/CB_project_bug_04_remove_wxscintilla_cb.patch)
https://github.com/stahta01/cb_misc/blob/master/Patches/svn/CB_project_bug_05_remove_wxpropgrid.patch (https://github.com/stahta01/cb_misc/blob/master/Patches/svn/CB_project_bug_05_remove_wxpropgrid.patch)
https://github.com/stahta01/cb_misc/blob/master/Patches/svn/CB_project_bug_07_remove_depends_on_lib_finder.patch (https://github.com/stahta01/cb_misc/blob/master/Patches/svn/CB_project_bug_07_remove_depends_on_lib_finder.patch)
https://github.com/stahta01/cb_misc/blob/master/Patches/svn/CB_project_bug_08_remove_or_fix_update_unit_filename.patch (https://github.com/stahta01/cb_misc/blob/master/Patches/svn/CB_project_bug_08_remove_or_fix_update_unit_filename.patch)

Edit2: To download a patch just click on RAW button on web page.

Patch 4; removes incorrect reference to wxscintilla_cb.
Patch 5; removes incorrect reference to wxpropgrid.
Patch 7; Replaces depends of lib_finder with depends on wxContribItems.
Patch 8; Makes sure the update script/batch is correct for the CB Project and removes bat from Unix Projects and scripts from Windows Projects.

Note: I have only test these change using Windows 32 bit (both wx28 and wx30).
Edit: This means I did NOT test Linux/Unix or Windows64 CB Projects.

So, the changes really need tested by a Linux user before applying.

Tim S.
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: oBFusCATed on October 24, 2014, 02:08:03 am
The patches look fine, but can you cjange the commit messages to something like "- projects: Bla bla blablabla (thanks stahta01)"?
This way I can commit them pretty easily and I won't have to spend time fixing the messages.

hint: Use git rebase -i HEAD^6 to do it.
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 24, 2014, 02:26:47 am
Quote from: oBFusCATed on October 24, 2014, 02:08:03 am
The patches look fine, but can you cjange the commit messages to something like "- projects: Bla bla blablabla (thanks stahta01)"?
This way I can commit them pretty easily and I won't have to spend time fixing the messages.

hint: Use git rebase -i HEAD^6 to do it.

I will try.
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 24, 2014, 03:48:41 am
Took me a half dozen tries; but, I think I have done it.

Using this command
Code
git rebase -i HEAD~6

After changing editor to notepad++ using this command; VIM is too much for me to try.

Found on http://stackoverflow.com/questions/1634161/how-do-i-use-notepad-or-other-with-msysgit (http://stackoverflow.com/questions/1634161/how-do-i-use-notepad-or-other-with-msysgit)
Code
git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 24, 2014, 05:31:39 am
Just added the message prefix to three of the commits in Git branch of "PCH Fix: ".
Decided that made more sense.

Tim S.
 
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: oBFusCATed on October 24, 2014, 10:23:01 am
Keep in mind that we are using the first character of the message to designate if  the commit is important to the user. '-' is used for build fixes and other internal or minimal changes. '*' is used for changes to the ui, new features, fixing important bugs, etc. This help when making a release to gather to logs of changes.

Can I ask you to do another rebase and add '-' at the beginning of every commit?
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 24, 2014, 05:05:23 pm
Quote from: oBFusCATed on October 24, 2014, 10:23:01 am
Keep in mind that we are using the first character of the message to designate if  the commit is important to the user. '-' is used for build fixes and other internal or minimal changes. '*' is used for changes to the ui, new features, fixing important bugs, etc. This help when making a release to gather to logs of changes.

Can I ask you to do another rebase and add '-' at the beginning of every commit?

OK.

Will do so.

Tim S.
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 24, 2014, 05:16:30 pm
Will take a little time

FYI: "src/sdk/resources/lexers/lexer_bibtex.sample" is causing me problem because Git is complaining about LF issues.

But, I was messing with using using an .gitattributes file.

I had to tell Git that the file is Binary in it.

Should only take a few minutes more.

Tim S.
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 24, 2014, 05:24:31 pm
I have added the prefix of "- " to commit message.

Note: I have no idea if you should or can fix the fact of Git treating "src/sdk/resources/lexers/lexer_bibtex.sample" as Binary from my viewpoint or whether it is just a problem on my end.

I think "src/sdk/resources/lexers/lexer_bibtex.sample" was saved with CRLF in it and that is causing the problem.

Tim S.
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: oBFusCATed on October 25, 2014, 01:25:08 am
In svn...

I don't know what is going on with the lexer_bibtex.sample...
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 26, 2014, 12:25:35 am
Quote from: oBFusCATed on October 25, 2014, 01:25:08 am
In svn...

I don't know what is going on with the lexer_bibtex.sample...

I think this command needs ran on it.

My Git and Svn are set up slightly weird so I get more line ending issues.

I ran this command to create the patch below.
Code
svn propset svn:eol-style native src/sdk/resources/lexers/lexer_bibtex.sample

Code
Index: src/sdk/resources/lexers/lexer_bibtex.sample
===================================================================
--- src/sdk/resources/lexers/lexer_bibtex.sample	(revision 10009)
+++ src/sdk/resources/lexers/lexer_bibtex.sample	(working copy)

Property changes on: src/sdk/resources/lexers/lexer_bibtex.sample
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property

Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: oBFusCATed on October 26, 2014, 02:50:05 am
Probably someone with svn checkout should do it, I don't want to test this part of git-svn...
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 26, 2014, 02:48:41 am
Quote from: oBFusCATed on October 26, 2014, 02:50:05 am
Probably someone with svn checkout should do it, I don't want to test this part of git-svn...

Sounds correct, I have no idea that git-svn did this even.

But, I thought you had svn checkout, also.

But, I can understand using only one of them. I am still learning Git; I almost feel like I have learned as much about Git as a know about Svn.

FYI:

I found three files in my local Git repo with mixed line ending.
The do NOT seem to have mixed line ending in SVN.

Here the three files; no idea if it is just my local repo with mixed line ending or it is your repo that has the mixed line endings.
Code
src/sdk/scripting/bindings/scriptbindings.cpp
src/sdk/filemanager.cpp
src/plugins/scriptedwizard/compilerpanel.cpp


Thank you again for applying by last 6 commits; I am working some more.
Decided to wait a few days to before asking you to test and apply them.

Tim S.
Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: stahta01 on October 30, 2014, 11:44:00 am
oBFusCATed: Either my Git repo is NOT pulling right or your Git Repo is NOT updating.

Tim S.

Title: Re: Message to oBFusCATed or other CB Devs about patches to CB Projects.
Post by: oBFusCATed on October 30, 2014, 08:17:27 pm
It is manually updated... once a day or less often...