Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32078
Modified Files: Makefile Makefile.buildlayout TODO Log Message:
- finally got a Linux Pd-extended release out, RC5
- built a tar.bz2 package maker with a generated Makefile for installing and uninstalling
- switched all Makefiles to follow GNU $(DESTDIR)/$(prefix) standards
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.buildlayout 27 Nov 2005 05:04:01 -0000 1.11 --- Makefile.buildlayout 28 Nov 2005 06:46:16 -0000 1.12 *************** *** 41,44 **** --- 41,45 ---- OS_NAME = linux EXTENSION = pd_linux + prefix = /usr/local else ifeq ($(UNAME),Darwin) *************** *** 76,86 ****
# destinations examplesdir = $(pddocdir)/examples - bindir = $(prefix)/bin - pddocdir = $(prefix)/doc - includedir = $(prefix)/include - libdir = $(prefix)/lib - mandir = $(prefix)/man - objectsdir = $(prefix)/extra helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals --- 77,99 ----
# destinations + bindir = $(DESTDIR)$(prefix)/bin + includedir = $(DESTDIR)$(prefix)/include + libdir = $(DESTDIR)$(prefix)/lib + mandir = $(DESTDIR)$(prefix)/man + + ifeq ($(OS_NAME),darwin) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + ifeq ($(OS_NAME),win) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + objectsdir = $(libdir)/pd/extra + pddocdir = $(libdir)/pd/doc + endif + endif + examplesdir = $(pddocdir)/examples helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals *************** *** 94,115 ****
# first make sure that the directory structure is setup ! $(prefix): ! install -d $(prefix)
! $(examplesdir): $(prefix) install -d $(examplesdir)
! $(pddocdir): $(prefix) install -d $(pddocdir)
! $(helpdir): $(prefix) install -d $(helpdir)
! $(manualsdir): $(prefix) install -d $(manualsdir)
! $(objectsdir): $(prefix) install -d $(objectsdir)
#==============================================================================# --- 107,135 ----
# first make sure that the directory structure is setup ! $(DESTDIR): ! install -d $(DESTDIR)
! $(bindir): $(DESTDIR) ! install -d $(bindir) ! ! $(examplesdir): $(DESTDIR) install -d $(examplesdir)
! $(includedir): $(DESTDIR) ! install -d $(includedir) ! ! $(pddocdir): $(DESTDIR) install -d $(pddocdir)
! $(helpdir): $(DESTDIR) install -d $(helpdir)
! $(manualsdir): $(DESTDIR) install -d $(manualsdir)
! $(objectsdir): $(DESTDIR) install -d $(objectsdir)
+ installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir)
#==============================================================================# *************** *** 185,191 **** install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(prefix) @echo " " ! @echo "Build destination cleaned: $(prefix)"
--- 205,212 ---- install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(DESTDIR)$(prefix) ! -rmdir $(DESTDIR) @echo " " ! @echo "Build destination cleaned: $(DESTDIR)"
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 27 Nov 2005 05:04:01 -0000 1.15 --- Makefile 28 Nov 2005 06:46:16 -0000 1.16 *************** *** 11,15 ****
cvs_root_dir = $(CWD)/.. ! prefix = $(cvs_root_dir)/packages/build BUILDLAYOUT_DIR = $(CWD)
--- 11,15 ----
cvs_root_dir = $(CWD)/.. ! DESTDIR = $(CWD)/build BUILDLAYOUT_DIR = $(CWD)
*************** *** 91,94 **** --- 91,95 ---- DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \ cvs_root_dir=$(cvs_root_dir) \ + DESTDIR=$(DESTDIR) \ prefix=$(prefix) \ UNAME=$(UNAME) *************** *** 121,129 **** flext: # nusmuk ! cd $(externals_src)/nusmuk/msd && $(externals_src)/grill/flext/build.sh \ pd gcc ! cd $(externals_src)/nusmuk/msd2D && $(externals_src)/grill/flext/build.sh \ pd gcc ! cd $(externals_src)/nusmuk/msd3D && $(externals_src)/grill/flext/build.sh \ pd gcc
--- 122,130 ---- flext: # nusmuk ! -cd $(externals_src)/nusmuk/msd && $(externals_src)/grill/flext/build.sh \ pd gcc ! -cd $(externals_src)/nusmuk/msd2D && $(externals_src)/grill/flext/build.sh \ pd gcc ! -cd $(externals_src)/nusmuk/msd3D && $(externals_src)/grill/flext/build.sh \ pd gcc
*************** *** 136,161 **** #------------------------------------------------------------------------------ # pd ! # pd's makefile has some of its own variables that need to be remapped ! # this relies on patches/build_vars_4_makefile.in.patch hans@at.or.at ! DESTDIR = "" ! ifeq ($(OS_NAME),darwin) ! libpddir = $(prefix) ! libpdbindir = $(bindir) ! else ! ifeq ($(OS_NAME),win) ! libpddir = $(prefix) ! libpdbindir = $(bindir) ! else ! libpddir = $(prefix)/lib/pd ! libpdbindir = $(libpddir)/bin ! endif ! endif ! ! PD_DEST_PATHS = $(DEST_PATHS) DESTDIR=$(DESTDIR) \ ! libpddir=$(libpddir) \ ! libpdbindir=$(libpdbindir)
PD_CONFIGURE_FLAGS = ! PD_EXTRA_FLAGS =
# Pd sometimes needs a specific autoconf, which is labeled differently on different --- 137,145 ---- #------------------------------------------------------------------------------ # pd ! # pd's makefile has some of its own variables that need to be remapped, ! # this relies on patches/build_vars_4_makefile.in.patch.
PD_CONFIGURE_FLAGS = ! PD_BUILD_FLAGS =
# Pd sometimes needs a specific autoconf, which is labeled differently on different *************** *** 164,177 **** PD_AUTOCONF = autoconf
- pd: ! echo "OS_NAME $(OS_NAME)" ! echo "DESTDIR $(DESTDIR) libpdbindir $(libpdbindir)" ! echo "DEST_PATHS $(DEST_PATHS)" ! echo "PD_DEST_PATHS $(PD_DEST_PATHS)" ! echo "PD_EXTRA_FLAGS $(PD_EXTRA_FLAGS)" -cd $(pd_src)/src/ && $(PD_AUTOCONF) -cd $(pd_src)/src && ./configure $(PD_CONFIGURE_FLAGS) && \ ! make $(PD_DEST_PATHS) $(PD_EXTRA_FLAGS)
--- 148,165 ---- PD_AUTOCONF = autoconf
pd: ! @echo "OS_NAME $(OS_NAME)" ! @echo "===================================================================" ! @echo "DESTDIR $(DESTDIR) libpdbindir $(libpdbindir)" ! @echo "===================================================================" ! @echo "DEST_PATHS $(DEST_PATHS)" ! @echo "===================================================================" ! @echo "DEST_PATHS $(DEST_PATHS)" ! @echo "===================================================================" ! @echo "PD_BUILD_FLAGS $(PD_BUILD_FLAGS)" ! @echo "===================================================================" -cd $(pd_src)/src/ && $(PD_AUTOCONF) -cd $(pd_src)/src && ./configure $(PD_CONFIGURE_FLAGS) && \ ! make $(DEST_PATHS) $(PD_BUILD_FLAGS)
*************** *** 183,189 ****
# this is used for installing into a pre-build Pd binary ! extended_install: abstractions_install doc_install externals_install \ ! flext_install gem_install readme_install welcome_install license_install \ ! noncvs_install
--- 171,177 ----
# this is used for installing into a pre-build Pd binary ! extended_install: abstractions_install doc_install extensions_install \ ! externals_install flext_install gem_install readme_install welcome_install \ ! license_install noncvs_install
*************** *** 205,208 **** --- 193,202 ----
#------------------------------------------------------------------------------ + # extensions_install + extensions_install: + cd $(extensions_src) && make $(DEST_PATHS) install + + + #------------------------------------------------------------------------------ # externals_install externals_install: *************** *** 210,213 **** --- 204,208 ----
+ #------------------------------------------------------------------------------ # flext_install *************** *** 226,253 **** # cp buildsys/mac/pd/config-gcc.def buildsys/config-mac-pd-gcc.txt && \ # echo Copied template sys config file \ ! ) \ ! ) && \ ! ( \ ! cat buildsys/config-mac-pd-gcc.txt | \ ! sed "s/^PDPATH=.*/PDPATH=../../../pd/" > buildsys/config-mac-pd-gcc.txt \ ! ) && \ ! ( \ ! cat package.txt | sed "s/^PRECOMPILE=.*/PRECOMPILE=/" > package.txt \ ! ) && \ ! ( \ ! cat buildsys/mac/pd/gnumake-gcc-ext.inc | \ ! sed "s/^LDFLAG\S +=.*/LDFLAG\S += -bundle -bundle_loader ../../../pd/bin/pd/" > buildsys/mac/pd/gnumake-gcc-ext.inc \ ! ) && \ ! ( \ ! cat buildsys/mac/pd/gnumake-gcc-flext.inc | \ ! sed "s/^LDFLAG\S +=.*/LDFLAG\S += -dynamiclib -undefined dynamic_lookup /" > buildsys/mac/pd/gnumake-gcc-flext.inc \ ! ) && \ ! ( \ ! test -f config.txt || \ ! ( \ ! cp -f build/config-mac.def config.txt && \ ! echo Copied template flext config file \ ! ) \ ! ) && \ # MACOSX_DEPLOYMENT_TARGET=10.3 bash build.sh pd gcc build-release-shared FLEXTLIB=@executable_path/../extra FLEXTINC=../flext/source FLEXTSYS=$(objectsdir) # ln -sf $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.dylib --- 221,248 ---- # cp buildsys/mac/pd/config-gcc.def buildsys/config-mac-pd-gcc.txt && \ # echo Copied template sys config file \ ! # ) \ ! # ) && \ ! # ( \ ! # cat buildsys/config-mac-pd-gcc.txt | \ ! # sed "s/^PDPATH=.*/PDPATH=../../../pd/" > buildsys/config-mac-pd-gcc.txt \ ! # ) && \ ! # ( \ ! # cat package.txt | sed "s/^PRECOMPILE=.*/PRECOMPILE=/" > package.txt \ ! # ) && \ ! # ( \ ! # cat buildsys/mac/pd/gnumake-gcc-ext.inc | \ ! # sed "s/^LDFLAG\S +=.*/LDFLAG\S += -bundle -bundle_loader ../../../pd/bin/pd/" > buildsys/mac/pd/gnumake-gcc-ext.inc \ ! # ) && \ ! # ( \ ! # cat buildsys/mac/pd/gnumake-gcc-flext.inc | \ ! # sed "s/^LDFLAG\S +=.*/LDFLAG\S += -dynamiclib -undefined dynamic_lookup /" > buildsys/mac/pd/gnumake-gcc-flext.inc \ ! # ) && \ ! # ( \ ! # test -f config.txt || \ ! # ( \ ! # cp -f build/config-mac.def config.txt && \ ! # echo Copied template flext config file \ ! # ) \ ! # ) && \ # MACOSX_DEPLOYMENT_TARGET=10.3 bash build.sh pd gcc build-release-shared FLEXTLIB=@executable_path/../extra FLEXTINC=../flext/source FLEXTSYS=$(objectsdir) # ln -sf $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.dylib *************** *** 261,267 **** $(manualsdir)/flext # FLEXTERNALS ! ######### # dyn~ ! -cd $(externals_src)/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared FLEXTLIB=../flext/pd-darwin/release-shared FLEXTINC=../flext/source FLEXTSYS=$(objectsdir) -install -p $(externals_src)/grill/dynext/pd-darwin/release-shared/*.$(EXTENSION) $(objectsdir) install -p $(externals_src)/grill/dynext/pd/*.pd $(helpdir) --- 256,265 ---- $(manualsdir)/flext # FLEXTERNALS ! #------------------------------------------------------------------------------# # dyn~ ! # -cd $(externals_src)/grill/dynext && \ ! # bash ../flext/build.sh pd gcc build-release-shared \ ! # FLEXTLIB=../flext/pd-darwin/release-shared \ ! # FLEXTINC=../flext/source FLEXTSYS=$(objectsdir) -install -p $(externals_src)/grill/dynext/pd-darwin/release-shared/*.$(EXTENSION) $(objectsdir) install -p $(externals_src)/grill/dynext/pd/*.pd $(helpdir) *************** *** 273,277 **** ######### # pool ! -cd $(externals_src)/grill/pool && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source -install -p $(externals_src)/grill/pool/pd-darwin/release-shared/*.$(EXTENSION) $(objectsdir) install -p $(externals_src)/grill/pool/pool-help.pd $(helpdir) --- 271,275 ---- ######### # pool ! # -cd $(externals_src)/grill/pool && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source -install -p $(externals_src)/grill/pool/pd-darwin/release-shared/*.$(EXTENSION) $(objectsdir) install -p $(externals_src)/grill/pool/pool-help.pd $(helpdir) *************** *** 382,386 **** pd_install: pd cd $(pd_src)/src && \ ! make $(PD_DEST_PATHS) $(PD_EXTRA_FLAGS) install install -d $(manualsdir)/$(PD_NAME) install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME) --- 380,384 ---- pd_install: pd cd $(pd_src)/src && \ ! make $(DEST_PATHS) $(PD_BUILD_FLAGS) install install -d $(manualsdir)/$(PD_NAME) install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME) *************** *** 493,498 **** doc_format: # clean out cruft files ! -find $(prefix) -name .DS_Store -delete ! -find $(prefix) -name '*.*.bak' -delete # run script to move help-*.pd files to *-help.pd according to the standard cd $(helpdir) && \ --- 491,496 ---- doc_format: # clean out cruft files ! -find $(DESTDIR) -name .DS_Store -delete ! -find $(DESTDIR) -name '*.*.bak' -delete # run script to move help-*.pd files to *-help.pd according to the standard cd $(helpdir) && \ *************** *** 581,585 ****
pd_clean: ! -cd $(pd_src) && make $(PD_DEST_PATHS) clean
--- 579,583 ----
pd_clean: ! -cd $(pd_src) && make $(DEST_PATHS) clean
*************** *** 591,592 **** --- 589,604 ----
distclean: clean cruft_clean + + test: + @echo "PD_VERSION: $(PD_VERSION)" + @echo "PACKAGE_VERSION: $(PACKAGE_VERSION)" + @echo "CWD $(CWD)" + @echo "DESTDIR $(DESTDIR)" + @echo "PREFIX $(prefix)" + @echo "BINDIR $(bindir)" + @echo "LIBDIR $(libdir)" + @echo "OBJECTSDIR $(objectsdir)" + @echo "PDDOCDIR $(pddocdir)" + @echo "HELPDIR $(helpdir)" + @echo "MANUALSDIR $(manualsdir)" + @echo "EXAMPLESDIR $(examplesdir)"
Index: TODO =================================================================== RCS file: /cvsroot/pure-data/packages/TODO,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TODO 26 Nov 2005 04:18:51 -0000 1.9 --- TODO 28 Nov 2005 06:46:16 -0000 1.10 *************** *** 5,22 **** - fix scripts/checkout...sh. It doesn't cvs co into the newly created pure-data folder
- - rename "applications" to "examples" - - - downcase *_DEST and *_SRC to be more readable - - - change CWD to packages_src where appropriate - - - add DESTDIR to the top of each Makefile - - test for configure before running autoconf/clean configure on distclean
- - try including packages/Makefile in darwin_app/Makefile to see if I can run pacakges/makefile targets tehn - - - On GNU/Linux, figure out how to deal with build/extra vs. build/lib/pd/extra - - global optimization flags ideally, you would use a version of Pd that is fully optimized for your --- 5,10 ---- *************** *** 31,46 **** - mDNS objects!
! - make standard targets: distclean (*~, etc.), installdirs (make just the ! dirs), uninstall instead of install_clean
- help menu
- check up on this bug: Opening Help patches from "Pure Documentation" - - - make help menu function check if item exists before trying to make a - menu item so that it doesn't break pd.tk<->pd interaction (i.e. windows - titled x50bf90). (the recursive function might have fixed this) - - - port to Linux/Windows
- Preferences --- 19,27 ---- - mDNS objects!
! - make standard targets: distclean (*~, etc.), uninstall instead of install_clean
- help menu
- check up on this bug: Opening Help patches from "Pure Documentation"
- Preferences