Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7428
Modified Files: Makefile Makefile.buildlayout TODO Log Message: created Pd-0.38.4-extendedRC3.app release
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.buildlayout 21 Nov 2005 04:37:41 -0000 1.5 --- Makefile.buildlayout 21 Nov 2005 23:01:18 -0000 1.6 *************** *** 57,61 **** endif
- #==============================================================================# # --- 57,60 ---- *************** *** 116,119 **** --- 115,143 ---- #==============================================================================# # + # PD VERSION AND PACKAGE NAMING + # + #==============================================================================# + + + PD_MAJOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \ + sed 's/char pd_version[] = "Pd version ([0-9]).[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\n";/\1/') + PD_MINOR_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \ + sed 's/char pd_version[] = "Pd version [0-9].([0-9]*)[. TES-]*([0-9]*)[0-9extndRC.-]*\n";/\1/') + PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(PD_SRC)/src/s_main.c | \ + sed 's/char pd_version[] = "Pd version [0-9].[0-9]*[. TES-]*([0-9]*)[0-9extndRC.-]*\n";/\1/') + # the separators [.-] need to be the same as in s_main.c or the regexps break + PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) + + + # release version for this distro + PACKAGE_VERSION = extended-RC3 + PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) + DMG_NAME = $(PACKAGE_NAME) + + + + + #==============================================================================# + # # CLEAN TARGETS #
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 21 Nov 2005 07:03:50 -0000 1.8 --- Makefile 21 Nov 2005 23:01:18 -0000 1.9 *************** *** 29,47 ****
- PD_MAJOR_VERSION := $(shell /usr/bin/grep 'Pd version' $(PD_SRC)/src/s_main.c | \ - sed 's/char pd_version[] = "Pd version ([0-9]).[0-9]*[. TES]*[0-9]*[0-9extndRC.-]*\n";/\1/') - PD_MINOR_VERSION := $(shell /usr/bin/grep 'Pd version' $(PD_SRC)/src/s_main.c | \ - sed 's/char pd_version[] = "Pd version [0-9].([0-9]*)[. TES]*([0-9]*)[0-9extndRC.-]*\n";/\1/') - PD_BUGFIX_VERSION := $(shell /usr/bin/grep 'Pd version' $(PD_SRC)/src/s_main.c | \ - sed 's/char pd_version[] = "Pd version [0-9].[0-9]*[. TES]*([0-9]*)[0-9extndRC.-]*\n";/\1/') - PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION)-$(PD_BUGFIX_VERSION) - - - # release version for this distro - PACKAGE_VERSION = extended-RC3 - PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) - DMG_NAME = $(PACKAGE_NAME) - - CYCLONE_MAJOR_VERSION := $(shell grep CYCLONE_VERSION \ $(EXTERNALS_SRC)/miXed/cyclone/build_counter | cut -d ' ' -f 3 | \ --- 29,32 ---- *************** *** 232,238 **** --- 217,226 ---- #------------------------------------------------------------------------------ # pd + PD_NAME=Pd pd_install: pd cd $(PD_SRC)/src && \ make $(PD_DEST_PATHS) $(PD_EXTRA_FLAGS) install + install -d $(MANUALS_DEST)/$(PD_NAME) + install -p $(PD_SRC)/src/notes.txt $(MANUALS_DEST)/$(PD_DEST)
*************** *** 252,269 **** #==============================================================================#
! LICENSE_FILE = $(INSTALL_PREFIX)/License.html license_install: # generate HTML version of License touch $(LICENSE_FILE) echo "<html><body>" >> "$(LICENSE_FILE)" ! echo "<h3>(Parts of this package can be used under the Pd/BSD license)</h3>" >> "$(LICENSE_FILE)" echo "<font size="-1">" >> "$(LICENSE_FILE)" cat "$(EXTERNALS_SRC)/creb/COPYING" | sed -e 's/^$$/<P>/g' >> "$(LICENSE_FILE)" echo "</font></body></html>" >> $(LICENSE_FILE) ! install -p "$(PD_SRC)/LICENSE.txt" "$(INSTALL_PREFIX)/PD LICENSE.txt"
! WELCOME_FILE = $(INSTALL_PREFIX)/Welcome.html welcome_install: touch $(WELCOME_FILE) --- 240,259 ---- #==============================================================================#
! LICENSE_FILE = $(MANUALS_DEST)/$(PD_NAME)/License.html license_install: # generate HTML version of License touch $(LICENSE_FILE) echo "<html><body>" >> "$(LICENSE_FILE)" ! echo "<h3>(Parts of this package can be used under " >> "$(LICENSE_FILE)" ! echo "<a href="PD%20LICENSE.txt">Pd"s BSD license</a>)</h3>" >> "$(LICENSE_FILE)" echo "<font size="-1">" >> "$(LICENSE_FILE)" cat "$(EXTERNALS_SRC)/creb/COPYING" | sed -e 's/^$$/<P>/g' >> "$(LICENSE_FILE)" echo "</font></body></html>" >> $(LICENSE_FILE) ! # Pd's license file ! install -p "$(PD_SRC)/LICENSE.txt" "$(MANUALS_DEST)/$(PD_NAME)/PD LICENSE.txt"
! WELCOME_FILE = $(MANUALS_DEST)/$(PD_NAME)/Welcome.html welcome_install: touch $(WELCOME_FILE) *************** *** 279,283 ****
! README_FILE = $(INSTALL_PREFIX)/ReadMe.html readme_install: echo $(CYCLONE_RELEASE) --- 269,273 ----
! README_FILE = $(MANUALS_DEST)/$(PD_NAME)/ReadMe.html readme_install: echo $(CYCLONE_RELEASE) *************** *** 369,372 **** --- 359,363 ----
patch_pd: + @echo PD_SRC $(PD_SRC) # change Pd's version number to reflect the extended build sed -i.bak 's/(pd_version[] = "Pd version )[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/' $(PD_SRC)/src/s_main.c *************** *** 385,393 **** @echo "patching succeeded!"
unpatch_pd: ! # this sed pattern won't work with TEST versions ! cd $(PD_SRC)/src && \ ! sed -i.bak 's/(pd_version[] = "Pd version [0-9.]*)[0-9extndRC.-]*/\1/' \ ! s_main.c # apply all platform-neutral patches for patch in $(wildcard $(CWD)/patches/*.patch); do \ --- 376,385 ---- @echo "patching succeeded!"
+ unpatch_pd: ! # this sed pattern won't work with TEST versions. ! sed -i.bak \ ! 's/(pd_version[] = "Pd version [0-9].[0-9]*[.-][0-9]*)[0-9extndRC.-]*/\1/' \ ! $(PD_SRC)/src/s_main.c # apply all platform-neutral patches for patch in $(wildcard $(CWD)/patches/*.patch); do \
Index: TODO =================================================================== RCS file: /cvsroot/pure-data/packages/TODO,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TODO 21 Nov 2005 04:37:41 -0000 1.4 --- TODO 21 Nov 2005 23:01:18 -0000 1.5 *************** *** 1,3 **** --- 1,11 ----
+ - rename "applications" to "examples" + + - downcase *_DEST and *_SRC to be more readable + + - On GNU/Linux, figure out how to deal with build/extra vs. build/lib/pd/extra + + - fix unpatch_pd bug that doesn't fix the version name in s_main.c + - global versioning system the package releases should have versions of there own which apply to *************** *** 11,35 **** everything compile for that CPU.
! - libdir ! ! - document libdir format ! ! - write .sh script that generates the mylibrary/mylibrary.pd file with the ! meta data. It should take command line arguments, and put them into the ! meta file. ! ! - rename "applications" to "examples" ! ! - downcase *_DEST and *_SRC to be more readable ! ! - make pd section since I can't easily modify the pd tree ! ! - add notes.txt to manuals ! ! - create patch system and incorporate IO's hex patch ! ! - hex convertor for setup function names, and object file names ! ! - merge in tigital's Makefile++
- add GRIPD for Anders --- 19,23 ---- everything compile for that CPU.
! - document libdir format
- add GRIPD for Anders