From c75a67473b089c96b7cf591feb538aee589fec0a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 21 Oct 2006 04:55:39 +0000 Subject: cleaned up version handling to make more sense; removed some obsolete chmods svn path=/trunk/; revision=6151 --- packages/Makefile | 13 +++++-------- packages/Makefile.buildlayout | 8 ++++---- packages/darwin_app/Makefile | 44 +++++++++++++++++++++---------------------- packages/linux_make/Makefile | 2 +- packages/win32_inno/Makefile | 5 ++--- 5 files changed, 34 insertions(+), 38 deletions(-) (limited to 'packages') diff --git a/packages/Makefile b/packages/Makefile index 2add5cfa..185c463a 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -674,9 +674,6 @@ doc_format: # run script to move help-*.pd files to *-help.pd according to the standard cd $(helpdir) && \ $(scripts_src)/convert-help-to-standard.sh -# remove write perms to prevent people form editing the helpfiles by mistake - find $(pddocdir) -name '*.pd' -print0 | xargs -0 chmod a-wx - find $(pddocdir) -name '*.txt' -print0 | xargs -0 chmod a-wx @@ -783,14 +780,14 @@ set_version: # change Pd's version number to reflect the extended build # this needs the complete_version_defines patch to work cd $(pd_src)/src/ && \ - sed 's|^\(#define PD_TEST_VERSION "\).*"|\1$(PACKAGE_VERSION)"|' m_pd.h > \ + sed 's|^\(#define PD_TEST_VERSION "\).*"|\1$(PD-EXTENDED_VERSION)"|' m_pd.h > \ m_pd.h.tmp && mv m_pd.h.tmp m_pd.h unset_version: # change the version number back to the original # this needs the complete_version_defines patch to work cd $(pd_src)/src && \ - sed 's|^\(#define PD_TEST_VERSION ".*\)$(PACKAGE_VERSION_PREFIX).*"|\1"|' \ + sed 's|^\(#define PD_TEST_VERSION ".*\)$(PD-EXTENDED_VERSION_PREFIX).*"|\1"|' \ m_pd.h > m_pd.h.tmp && \ mv m_pd.h.tmp m_pd.h @@ -855,7 +852,7 @@ patch_pd_devel: # change Pd's version number to reflect the extended build # this needs the complete_version_defines patch to work cd $(pd_src)/src/ && \ - sed 's|^\(#define PD_TEST_VERSION "\).*"|\1$(PACKAGE_VERSION)"|' m_pd.h > \ + sed 's|^\(#define PD_TEST_VERSION "\).*"|\1$(PD-EXTENDED_VERSION)"|' m_pd.h > \ m_pd.h.tmp && mv m_pd.h.tmp m_pd.h @echo " " @echo "patching completed." @@ -865,7 +862,7 @@ unpatch_pd_devel: # change the version number back to the original # this needs the complete_version_defines patch to work cd $(pd_src)/src && \ - sed 's|^\(#define PD_TEST_VERSION ".*\)$(PACKAGE_VERSION)"|\1"|' \ + sed 's|^\(#define PD_TEST_VERSION ".*\)$(PD-EXTENDED_VERSION)"|\1"|' \ m_pd.h > m_pd.h.tmp && \ mv m_pd.h.tmp m_pd.h # apply all platform-specific patches @@ -929,7 +926,7 @@ distclean: cruft_clean test_locations: @echo "PD_VERSION: $(PD_VERSION)" - @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" + @echo "PD-EXTENDED_VERSION: $(PD-EXTENDED_VERSION)" @echo "CWD $(CWD)" @echo "DESTDIR $(DESTDIR)" @echo "PREFIX $(prefix)" diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout index a220ee91..cf50700b 100644 --- a/packages/Makefile.buildlayout +++ b/packages/Makefile.buildlayout @@ -161,7 +161,7 @@ PD_BUGFIX_VERSION := $(shell grep PD_BUGFIX_VERSION $(pd_src)/src/m_pd.h | \ sed 's|^.define *PD_BUGFIX_VERSION *\([0-9]*\).*|\1|' ) PD_TEST_VERSION := $(shell grep PD_TEST_VERSION $(pd_src)/src/m_pd.h | \ sed 's|^.define *PD_TEST_VERSION *"\(.*\)".*|\1|' ) -PD_VERSION := $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) +PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) ifneq ($(PD_TEST_VERSION),) PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION) endif @@ -169,10 +169,10 @@ endif VERSION_DATE := $(shell date +%Y-%m-%d) # release version for this distro -PACKAGE_VERSION_PREFIX = extended -PACKAGE_VERSION = $(PACKAGE_VERSION_PREFIX)-$(VERSION_DATE) -PACKAGE_NAME = Pd-$(PD_VERSION) +PD-EXTENDED_VERSION_PREFIX = extended +PD-EXTENDED_VERSION = $(PD-EXTENDED_VERSION_PREFIX)-$(VERSION_DATE) +PACKAGE_NAME = Pd-$(PD_VERSION) #==============================================================================# diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile index a201a4df..ff04787f 100644 --- a/packages/darwin_app/Makefile +++ b/packages/darwin_app/Makefile @@ -232,29 +232,28 @@ darwin_app_externals_c++: package: dmg -DMG_NAME = $(PACKAGE_NAME) dmg: hdiutil create -format UDRW -fs HFS+ -srcfolder "$(BUILD_BASE)" \ - -volname $(DMG_NAME) build.dmg + -volname $(PACKAGE_NAME) build.dmg # detach one with the same name first - -hdiutil detach "/Volumes/$(DMG_NAME)" + -hdiutil detach "/Volumes/$(PACKAGE_NAME)" hdiutil attach build.dmg - install -p $(manualsdir)/Pd/ReadMe.html "/Volumes/$(DMG_NAME)" - install -p -m0644 org.puredata.pd.plist "/Volumes/$(DMG_NAME)" - install -d "/Volumes/$(DMG_NAME)/.imagefolder" + install -p $(manualsdir)/Pd/ReadMe.html "/Volumes/$(PACKAGE_NAME)" + install -p -m0644 org.puredata.pd.plist "/Volumes/$(PACKAGE_NAME)" + install -d "/Volumes/$(PACKAGE_NAME)/.imagefolder" # background image will only show when the disk image is called "Pd-extended # the background image needs to be added to the .DS_Store to work -# install -p background.png "/Volumes/$(DMG_NAME)/.imagefolder/" - install -p DS_Store "/Volumes/$(DMG_NAME)/.DS_Store" - chmod -R a-w "/Volumes/$(DMG_NAME)/$(PD_APP_NAME).app/Contents/Resources/doc" - hdiutil detach `mount | grep $(DMG_NAME) | cut -d ' ' -f 1` - hdiutil convert -format UDZO -o "$(DMG_NAME).dmg" build.dmg +# install -p background.png "/Volumes/$(PACKAGE_NAME)/.imagefolder/" + install -p DS_Store "/Volumes/$(PACKAGE_NAME)/.DS_Store" + chmod -R a-w "/Volumes/$(PACKAGE_NAME)/$(PD_APP_NAME).app/Contents/Resources/doc" + hdiutil detach `mount | grep $(PACKAGE_NAME) | cut -d ' ' -f 1` + hdiutil convert -format UDZO -o "$(PACKAGE_NAME).dmg" build.dmg rm -f build.dmg # install license - hdiutil unflatten "$(DMG_NAME).dmg" + hdiutil unflatten "$(PACKAGE_NAME).dmg" /Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r SLA.r -a \ - -o "$(DMG_NAME).dmg" - hdiutil flatten "$(DMG_NAME).dmg" + -o "$(PACKAGE_NAME).dmg" + hdiutil flatten "$(PACKAGE_NAME).dmg" @@ -274,10 +273,11 @@ clean: package_clean package_clean: darwin_app_clean + -chmod -R u+w -- $(DESTDIR) -rm -rf -- $(DESTDIR) -rm Info.plist - -rm -f -- "$(CWD)/$(DMG_NAME)/ReadMe.html" - -rm -f -- "$(CWD)/$(DMG_NAME)/org.puredata.pd.plist" + -rm -f -- "$(CWD)/$(PACKAGE_NAME)/ReadMe.html" + -rm -f -- "$(CWD)/$(PACKAGE_NAME)/org.puredata.pd.plist" devel_clean: darwin_app_devel_clean $(MAKE) -C $(packages_src) $(DEST_PATHS) clean @@ -297,7 +297,7 @@ darwin_app_clean: -rmdir $(BUILD_BASE)/$(PD_APP_NAME).app/Contents -rmdir $(BUILD_BASE)/$(PD_APP_NAME).app -rmdir $(BUILD_BASE) - -rm -f -- "$(DMG_NAME).dmg" + -rm -f -- "$(PACKAGE_NAME).dmg" -rm -f -- build.dmg @@ -309,19 +309,19 @@ darwin_app_clean: test_package: echo "Bypassing test..." -# echo "Mounting $(DMG_NAME)" +# echo "Mounting $(PACKAGE_NAME)" # this triggers the license prompt... hmm how to work around that... -# cd $(CWD) && hdiutil mount "$(DMG_NAME).dmg" +# cd $(CWD) && hdiutil mount "$(PACKAGE_NAME).dmg" # some better tests should go in here -# echo "Ejecting $(DMG_NAME)" -# cd $(CWD) && hdiutil eject `mount | grep "$(DMG_NAME)" | cut -d ' ' -f 1` +# echo "Ejecting $(PACKAGE_NAME)" +# cd $(CWD) && hdiutil eject `mount | grep "$(PACKAGE_NAME)" | cut -d ' ' -f 1` test_locations: @echo "PD_VERSION: $(PD_VERSION)" @echo "PACKAGE_NAME: $(PACKAGE_NAME)" - @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" + @echo "PD-EXTENDED_VERSION: $(PD-EXTENDED_VERSION)" @echo "WISH: $(WISH)" @echo "TCLTK: $(TCLTK)" @echo "TCLTK_BUGFIX_VERSION: $(TCLTK_BUGFIX_VERSION)" diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile index 9e2b7617..e7edf99f 100755 --- a/packages/linux_make/Makefile +++ b/packages/linux_make/Makefile @@ -136,7 +136,7 @@ test_package: test_locations: @echo "PD_VERSION: $(PD_VERSION)" - @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" + @echo "PD-EXTENDED_VERSION: $(PD-EXTENDED_VERSION)" @echo "CWD $(CWD)" @echo "DESTDIR $(DESTDIR)" @echo "PREFIX $(prefix)" diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile index 6e903cce..73ec03e8 100755 --- a/packages/win32_inno/Makefile +++ b/packages/win32_inno/Makefile @@ -115,7 +115,7 @@ $(PD_INNO_SETUP): $(PD_INNO_SETUP).in cat "$(PD_INNO_SETUP).in" | \ sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/g' | \ sed 's/PD_VERSION/$(PD_VERSION)/g' | \ - sed 's/PACKAGE_VERSION/$(PACKAGE_VERSION)/g' > \ + sed 's/PD-EXTENDED_VERSION/$(PD-EXTENDED_VERSION)/g' > \ $(PD_INNO_SETUP) # start $(PD_INNO_SETUP) @@ -132,7 +132,6 @@ distclean: package_clean package_clean: -rm $(PD_INNO_SETUP) - -chmod -R +w $(DESTDIR) -rm -rf $(DESTDIR) -rm -rf Output @@ -152,7 +151,7 @@ test_package: test_locations: @echo "PD_VERSION: $(PD_VERSION)" - @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" + @echo "PD-EXTENDED_VERSION: $(PD-EXTENDED_VERSION)" @echo "CWD $(CWD)" @echo "DESTDIR $(DESTDIR)" @echo "PREFIX $(prefix)" -- cgit v1.2.1