Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10179
Modified Files: Makefile Makefile.buildlayout Log Message: version is now all defined in macros in m_pd.h in the complete_version_defines patch, and the regexps in packages/Makefile now rely on that patch
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Makefile 13 Feb 2006 03:55:07 -0000 1.26 --- Makefile 22 Feb 2006 06:13:49 -0000 1.27 *************** *** 653,659 **** -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile # change Pd's version number to reflect the extended build cd $(pd_src)/src/ && \ ! sed 's/(pd_version[] = "Pd version )[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/' s_main.c > s_main.c.tmp && \ ! mv s_main.c.tmp s_main.c @echo " " @echo "patching succeeded!" --- 653,660 ---- -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile # 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 > \ ! m_pd.h.tmp && mv m_pd.h.tmp m_pd.h @echo " " @echo "patching succeeded!" *************** *** 661,669 ****
unpatch_pd: ! # this sed pattern won't work with TEST versions cd $(pd_src)/src && \ ! sed 's/(pd_version[] = "Pd version [0-9].[0-9]*[.-][0-9]*)[0-9extndRC.-]*/\1/' \ ! s_main.c > s_main.c.tmp && \ ! mv s_main.c.tmp s_main.c # apply all platform-specific patches for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \ --- 662,671 ----
unpatch_pd: ! # 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"|' \ ! m_pd.h > m_pd.h.tmp && \ ! mv m_pd.h.tmp m_pd.h # apply all platform-specific patches for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.buildlayout 13 Feb 2006 03:55:07 -0000 1.18 --- Makefile.buildlayout 22 Feb 2006 06:13:49 -0000 1.19 *************** *** 152,156 ****
# release version for this distro ! PACKAGE_VERSION = extended-RC8 PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION)
--- 152,156 ----
# release version for this distro ! PACKAGE_VERSION = extended-test1 PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION)