commit d9bf8b2cca86a1285578e3521afcd1a451fda306 Author: Nicolas Vigier boklm@torproject.org Date: Fri Oct 16 17:07:05 2015 +0200

instantbird: build from a non-random directory --- projects/instantbird/build | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/projects/instantbird/build b/projects/instantbird/build index 1f79af7..5d91c50 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -31,44 +31,45 @@ ln -s /usr/bin/yasm-1 /var/tmp/dist/yasm/bin/yasm export PATH="/var/tmp/dist/yasm/bin:$PATH" [% END -%] cd $rootdir -tar xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] mkdir moz cd moz tar xf ../[% c('input_files_by_name/mozilla-src') %] -mv mozilla-* ../[% project %]-[% c('version') %]/mozilla -cd ../[% project %]-[% c('version') %] +mv mozilla-* /var/tmp/build/[% project %]-[% c('version') %]/mozilla +cd /var/tmp/build/[% project %]-[% c('version') %]

mkdir im/branding/messenger cp -R im/branding/nightly/* im/branding/messenger/

-for patch in $(ls -1 ../*.patch | sort) +for patch in $(ls -1 $rootdir/*.patch | sort) do patch -p1 < $patch done -for patch in $(ls -1 ../branding/*.patch | sort) +for patch in $(ls -1 $rootdir/branding/*.patch | sort) do patch -p1 < $patch done -cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt +cat $rootdir/spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt

[% IF c("var/osx") -%] -cp ../cert_override.txt im/app/profile +cp $rootdir/cert_override.txt im/app/profile [% END -%]

-cp ../xmppRegister* im/content/ +cp $rootdir/xmppRegister* im/content/

-cp ../branding/default*.png im/branding/messenger/gtk/ -cp ../branding/convWindow*.png im/branding/messenger/gtk/ -cp ../branding/blistWindow*.png im/branding/messenger/gtk/ +cp $rootdir/branding/default*.png im/branding/messenger/gtk/ +cp $rootdir/branding/convWindow*.png im/branding/messenger/gtk/ +cp $rootdir/branding/blistWindow*.png im/branding/messenger/gtk/

-cp ../branding/blistWindow.ico im/branding/messenger/windows/ -cp ../branding/convWindow.ico im/branding/messenger/windows/ -cp ../branding/default.ico im/branding/messenger/windows/ +cp $rootdir/branding/blistWindow.ico im/branding/messenger/windows/ +cp $rootdir/branding/convWindow.ico im/branding/messenger/windows/ +cp $rootdir/branding/default.ico im/branding/messenger/windows/

-cp ../branding/instantbird.ico im/branding/messenger/ -cp ../branding/instantbird.icns im/branding/messenger/ +cp $rootdir/branding/instantbird.ico im/branding/messenger/ +cp $rootdir/branding/instantbird.icns im/branding/messenger/

-cp ../branding/about.png im/branding/messenger/content/ +cp $rootdir/branding/about.png im/branding/messenger/content/

cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 @@ -80,7 +81,7 @@ then fi cd ..

-cp ../[% c('input_files_by_name/mozconfig') %] .mozconfig +cp $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig ./mozilla/mach build || ./mozilla/mach build ./mozilla/mach package mv obj-*/dist/*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %]