Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

Clean new build from latest trunk (r7945)

<< < (2/4) > >>

daniloz:
As I said in my post:

--- Quote from: daniloz on April 27, 2012, 11:47:33 am ---I'd still be able to run/debug it from devel, without compromising my output dir... :-)

--- End quote ---

Maybe that's just me, but I'd like to keep everything in the output dir the way it is, but still have the zip files there... I'll do a patch and submit...

daniloz:

--- Quote from: daniloz on April 27, 2012, 11:53:18 am ---Maybe that's just me, but I'd like to keep everything in the output dir the way it is, but still have the zip files there... I'll do a patch and submit...

--- End quote ---

I need some help in generating the patch, I have a local git repository (and use git svn reabase to keep in sync with trunk). I know there's a way to generate an SVN compatible patch, but I couldn't find again in the forum.

So, the question, how to do it?

MortenMacFly:

--- Quote from: daniloz on May 01, 2012, 04:30:08 pm ---So, the question, how to do it?

--- End quote ---
http://stackoverflow.com/questions/708202/git-format-patch-to-be-svn-compatible

http://codeprairie.net/blogs/chrisortman/archive/2008/01/14/creating-subversion-patches-with-git.aspx

headkase:

--- Quote from: daniloz on April 27, 2012, 10:43:55 am ---Hi All,

...<snip>...

2- there's a warning that devel\libcodeblocks.a cannot be found when building the plugins. I see that this dependency was introduced in r7088. Is this lib needed/generated at all on Win systems? An example is below.

...<snip>...


--- End quote ---

Have you tried rebuilding with a SVN version at or above SVN 7949?  See this thread:

Discussion.

Basically, from SVN 7940 to SVN 7948 there was a regression in file-handling in Code::Blocks.  SVN 7949 fixed the issue.  So, go back to a good SVN, like SVN 7932 Nightly, and build your later version using that.

daniloz:
So, here is the patch adding a post-build step to make all resources needed, i.e. zip files with manifest's, *.xrc and images inside for each target.

Also below is a script to generate SVN-like scripts from git (also attached as a zip file).

--- Code: ---#!/bin/sh
#
# usage: git-svn-diff [files]
# Generate an SVN-compatible diff against the tip of the tracking branch
TRACKING_BRANCH=`git config --get svn-remote.svn.fetch | sed -e 's/.*:refs\/remotes\///'`
REV=`git svn find-rev $(git rev-list --date-order --max-count=1 $TRACKING_BRANCH)`
git diff --no-prefix $(git rev-list --date-order --max-count=1 $TRACKING_BRANCH) $* |
sed -e "s/^+++ .*/&    (working copy)/" -e "s/^--- .*/&    (revision $REV)/" \
-e "s/^diff --git [^[:space:]]*/Index:/" \
-e "s/^index.*/===================================================================/"

--- End code ---

It would be a good idea to have this script and some description somewhere else, for easy access... maybe the Wiki, what do you think? If this is ok, my next question is: can I modify the Wiki, or there's some special permission needed?

Thx,
daniloz

[attachment deleted by admin]

Navigation

[0] Message Index

[#] Next page

[*] Previous page