Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6007
Modified Files: Makefile Log Message: initial support for devel branch (scons) via pd_devel target
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Makefile 25 Jul 2006 02:13:30 -0000 1.33 --- Makefile 28 Jul 2006 15:16:55 -0000 1.34 *************** *** 16,20 ****
# default target ! all: pd abstractions doc externals #all: pd abstractions doc externals flext gem @echo "Complete build succeeded!" --- 16,21 ----
# default target ! all: pd++ ! #all: pd abstractions doc externals #all: pd abstractions doc externals flext gem @echo "Complete build succeeded!" *************** *** 269,272 **** --- 270,280 ---- make $(DEST_PATHS) $(PD_BUILD_FLAGS)
+ pd++: + # the next line doesn't work? + # echo $$MACOSX_DEPLOYMENT_TARGET=10.3 + -cd $(pd_src) && scons app_pkg=yes desire=no prefix=$(DESTDIR)\ + portaudiopath=../../../../dev/portaudio \ + portmidipath=../../../../dev/portmidi \ + atomic=yes threadedsf=no debug=yes install
#==============================================================================# *************** *** 288,291 **** --- 296,304 ----
#------------------------------------------------------------------------------ + # install_devel + devel_install: pd_devel_install + @echo "Complete install succeeded!" + + #------------------------------------------------------------------------------ # abstractions_install abstractions_install: *************** *** 506,510 **** install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME)
!
#==============================================================================# --- 519,528 ---- install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME)
! #------------------------------------------------------------------------------ ! # pd_devel_install ! PD_NAME=Pd++ ! pd_devel_install: pd++ ! install -d $(manualsdir)/$(PD_NAME) ! install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME)
#==============================================================================# *************** *** 784,787 **** --- 802,847 ---- @echo "unpatching completed."
+ patch_pd_devel: + @echo pd_src $(pd_src) + # apply all platform-neutral patches + for patch in $(shell ls -1 $(CWD)/patches/*.patch); do \ + echo "Applying $$patch"; \ + cd $(pd_src)/src/ && patch -p0 < $$patch; \ + done + # apply all platform-specific patches + for patch in $(shell ls -1 $(CWD)/patches/$(OS_NAME)/*.patch); do \ + echo "Applying $$patch"; \ + cd $(pd_src)/src/ && patch -p0 < $$patch; \ + done + -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 completed." + + + 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"|' \ + m_pd.h > m_pd.h.tmp && \ + mv m_pd.h.tmp m_pd.h + # apply all platform-specific patches + for patch in $(shell ls -1r $(CWD)/patches/$(OS_NAME)/*.patch); do \ + echo "Applying $$patch"; \ + cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ + done + # apply all platform-neutral patches + for patch in $(shell ls -1r $(CWD)/patches/*.patch); do \ + echo "Applying $$patch"; \ + cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ + done + -rm -f -- $(pd_src)/src/configure $(pd_src)/src/makefile + @echo " " + @echo "unpatching completed."
#==============================================================================#