← Back to team overview

kicad-developers team mailing list archive

Re: [PATCH] Fix osx_fixbundle.sh for building on OSX

 

Hi,

oh, sorry for that… I have some other small changes in my local repository.
I guess that's why.

It's just a one-liner in CMakeLists.txt, the warning shouldn't be bad… just check adding of ${PROJECT_SOURCE_DIR}
Old:
  add_custom_command(TARGET osx_fix_bundles POST_BUILD COMMAND scripts/osx_fixbundle.sh COMMENT "Migrating dylibs to bundles")
New:
  add_custom_command(TARGET osx_fix_bundles POST_BUILD COMMAND ${PROJECT_SOURCE_DIR}/scripts/osx_fixbundle.sh ${PROJECT_SOURCE_DIR} COMMENT "Migrating dylibs to bundles")

General question:
If I push my local repository to my own launchpad branch, is it then more easy to pull a fix from there even if I have some (unrelated) changes in my branch?
Otherwise I would always have to maintain changes in 2 branches before sending a patch to ML...


Regards,
Bernhard

On 29.05.2014, at 18:59, jp charras <jp.charras@xxxxxxxxxx> wrote:

> Le 29/05/2014 12:14, Bernhard Stegmaier a écrit :
>> Hi,
>> 
>> when building on OSX with KICAD_BUILD_DYNAMIC=ON the last step making the app bundle portable fails for an out-of-tree build and doesn’t support .kiface yet.
>> 
>> The attached patch
>> * Fixes/supports out-of-tree builds
>> * Adds support for also fixing the .kiface
>> 
>> 
>> Regards,
>> Bernhard
> 
> Can you rebuild you patch against rev 4898:
> I have a warning when patching CMakeLists.txt (offset -22 lines when
> applying the patch)
> 
> Thanks.
> 
> 
> -- 
> Jean-Pierre CHARRAS


Follow ups

References