From 021708ab4cee3245e2306cb107f67d85f00823c1 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 27 Oct 2006 05:52:27 +0000 Subject: minor tweaks to support building Pd.app for pd-MAIN in the auto-builds svn path=/trunk/; revision=6169 --- packages/Makefile | 4 ++-- packages/darwin_app/Makefile | 4 ++++ scripts/auto-build/pd-main-auto-builder.sh | 38 +++++++++++++++++++++--------- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index 185c463a..695386a9 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -570,8 +570,8 @@ welcome_install: -rm $(WELCOME_FILE) touch $(WELCOME_FILE) echo "" >> $(WELCOME_FILE) - echo "" >> $(README_FILE) - echo "" >> $(README_FILE) + echo "" >> $(WELCOME_FILE) + echo "" >> $(WELCOME_FILE) echo "

" >> $(WELCOME_FILE) echo "

Version $(PD_VERSION)

" >> $(WELCOME_FILE) diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile index c0980195..a31bca3e 100644 --- a/packages/darwin_app/Makefile +++ b/packages/darwin_app/Makefile @@ -166,6 +166,10 @@ rez_install: darwin_app_embed_libs: ./embed-MacOSX-dependencies.sh $(PD_APP_CONTENTS) +# shortcut to install the readme on non-Extended builds +readme_install: + make -C $(packages_src) $(DEST_PATHS) readme_install + #------------------------------------------------------------------------------# darwin_app_core: darwin_app_wrapper diff --git a/scripts/auto-build/pd-main-auto-builder.sh b/scripts/auto-build/pd-main-auto-builder.sh index 3cd4e5b4..fcc65bab 100755 --- a/scripts/auto-build/pd-main-auto-builder.sh +++ b/scripts/auto-build/pd-main-auto-builder.sh @@ -35,20 +35,36 @@ cd `echo $0 | sed 's|$.*$/.*$|\1|'`/../.. auto_build_root_dir=`pwd` echo "root: $auto_build_root_dir" -package_name="/tmp/pd-${DATE}-${SYSTEM}-${HOSTNAME}-${platform_name}.tar.bz2" # let rsync handle the cleanup with --delete rsync -av --delete rsync://128.238.56.50/distros/pd-main/ \ ${auto_build_root_dir}/ - -cd ${auto_build_root_dir}/pd/src && \ - autoconf && \ - ./configure $configure_options && \ - make && \ - cd ../../ && \ - tar cjf $package_name pd && \ - rsync -a ${package_name} rsync://128.238.56.50/upload/${DATE}/ && \ - echo SUCCESS -rm -f -- $package_name +case $SYSTEM in + darwin) + archive_format=dmg + archive=`ls -1 ${auto_build_root_dir}/packages/darwin_app/build/Pd*.dmg` + upload_filename=`ls -1 ${archive} | sed "s|.*/$.*$\.${archive_format}|\1-${HOSTNAME}.${archive_format}|"` + cd ${auto_build_root_dir}/package/darwin_app/ + make package_clean + make darwin_app_core + make readme_install + make package + make test_locations + rsync -a ${archive} \ + rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \ + echo SUCCESS + ;; + *) + package_name="/tmp/pd-${DATE}-${SYSTEM}-${HOSTNAME}-${platform_name}.tar.bz2" + cd ${auto_build_root_dir}/pd/src && \ + autoconf && \ + ./configure $configure_options && \ + make && \ + cd ../../ && \ + tar cjf $package_name pd && \ + rsync -a ${package_name} rsync://128.238.56.50/upload/${DATE}/ && \ + echo SUCCESS + ;; +esac -- cgit v1.2.1