Update of /cvsroot/pure-data/abstractions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9503
Modified Files: Makefile Makefile.buildlayout Added Files: TODO Log Message:
Lots of changes, got the first complete(-ish) build with the new extended build system. I left as much of the old functionality in place as possible, definitely were it was being used. But there are some changes that break backwards compatibility, thought they should be noticed by few, and be easy to fix going forward.
Some highlights:
- centralized patch system (packages/patches with targets patch_pd and unpatch_pd)
- easily redirected builds, using INSTALL_PREFIX and all of the *_DEST variables. This makes building packages like Pd.app, .deb, .rpm, etc. much easier.
- libdir format: basically a libdir is a directory that has both the objects and the help files together in one folder. It can be added using -lib or the StartUp preferences, or you can access them via geiger namespaces, i.e. [mylibrary/myobject].
- special characters allow in setup function/file names for objects. This makes objects like [||~] possible without having to be in a library. Now they can be either .pd files or individual .pd_darwin files (thanks IOhannes for the patch).
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/abstractions/Makefile.buildlayout,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.buildlayout 18 Nov 2005 18:16:53 -0000 1.2 --- Makefile.buildlayout 21 Nov 2005 04:49:15 -0000 1.3 *************** *** 71,74 **** --- 71,75 ---- GEM_SRC = $(SRC_ROOT_DIR)/Gem GEMLIBS_SRC = $(SRC_ROOT_DIR)/GemLibs + PACKAGES_SRC = $(SRC_ROOT_DIR)/packages PD_SRC = $(SRC_ROOT_DIR)/pd SCRIPTS_SRC = $(SRC_ROOT_DIR)/scripts *************** *** 77,81 **** --- 78,86 ---- # destinations APPLICATIONS_DEST = $(DOCS_DEST)/examples + BIN_DEST = $(INSTALL_PREFIX)/bin DOCS_DEST = $(INSTALL_PREFIX)/doc + INCLUDE_DEST = $(INSTALL_PREFIX)/include + LIB_DEST = $(INSTALL_PREFIX)/lib + MAN_DEST = $(INSTALL_PREFIX)/man OBJECTS_DEST = $(INSTALL_PREFIX)/extra HELP_DEST = $(DOCS_DEST)/5.reference *************** *** 147,151 **** -rm $(OBJECTS_DEST)/*/*/*.pd -rm $(OBJECTS_DEST)/*/*.pd ! -rm $(OBJECTS_DEST)/*.pd -rm $(OBJECTS_DEST)/*/*/*.$(EXTENSION) -rm $(OBJECTS_DEST)/*/*.$(EXTENSION) --- 152,156 ---- -rm $(OBJECTS_DEST)/*/*/*.pd -rm $(OBJECTS_DEST)/*/*.pd ! -rm $(OBJECTS_DEST)/*.pd -rm $(OBJECTS_DEST)/*/*/*.$(EXTENSION) -rm $(OBJECTS_DEST)/*/*.$(EXTENSION)
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/abstractions/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 18 Nov 2005 18:16:52 -0000 1.9 --- Makefile 21 Nov 2005 04:49:15 -0000 1.10 *************** *** 3,7 **** # Centralized build system for "abstractions". # ! # see README for instructions hans@at.or.at # #==============================================================================# --- 3,8 ---- # Centralized build system for "abstractions". # ! # see for instructions: http://puredata.org/docs/developer/build ! # hans@at.or.at # #==============================================================================# *************** *** 9,13 **** CWD := $(shell pwd)
! # these are setup to be overridden by the packages/Makefile SRC_ROOT_DIR = $(CWD)/.. INSTALL_PREFIX = build --- 10,14 ---- CWD := $(shell pwd)
! # these are designed to be overridden by the packages/Makefile SRC_ROOT_DIR = $(CWD)/.. INSTALL_PREFIX = build *************** *** 16,20 **** # default target install: objects applications ! echo "abstractions install succeeded!"
include $(BUILDLAYOUT_DIR)/Makefile.buildlayout --- 17,22 ---- # default target install: objects applications ! @echo " " ! @echo "abstractions install succeeded!"
include $(BUILDLAYOUT_DIR)/Makefile.buildlayout *************** *** 68,71 **** --- 70,76 ---- install -p $(ABSTRACTIONS_SRC)/$(KEYBOARDKEYS_NAME)/abs/*.pd \ $(OBJECTS_DEST)/$(KEYBOARDKEYS_NAME) + $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(MEMENTO_NAME) \ + --author "Andrey Savitsky" \ + --description "objects for using keyboard keys for scrolling and selecting" install -d $(HELP_DEST)/$(KEYBOARDKEYS_NAME) install -p $(ABSTRACTIONS_SRC)/$(KEYBOARDKEYS_NAME)/doc/*-help.pd \ *************** *** 85,88 **** --- 90,95 ---- install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/La-kitchen/*.pd | \ grep -v '-help.pd') $(OBJECTS_DEST)/$(LA-KITCHEN_NAME) + $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(LA-KITCHEN_NAME) \ + --description "a collection of objects working with sensors" install -d $(HELP_DEST)/$(LA-KITCHEN_NAME) install -p $(ABSTRACTIONS_SRC)/La-kitchen/*-help.pd \ *************** *** 100,103 **** --- 107,114 ---- install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/rradical/memento/*.pd | \ grep -v '-help.pd') $(OBJECTS_DEST)/$(MEMENTO_NAME) + $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(MEMENTO_NAME) \ + --author "Frank Barknecht" \ + --license "GNU GPL" \ + --description "a collection of objects for managing state saving" install -d $(HELP_DEST)/$(MEMENTO_NAME) install -p $(ABSTRACTIONS_SRC)/rradical/memento/*-help.pd \ *************** *** 155,158 **** --- 166,172 ---- install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nusmuk/*.pd | \ grep -v '-help.pd') $(OBJECTS_DEST)/$(NUSMUK_NAME) + $(SCRIPTS_SRC)/generate-libdir-metafile.sh $(OBJECTS_DEST) $(NUSMUK_NAME) \ + --author "Cyrille Henry" \ + --description "a collection of objects for physical modelling" install -d $(HELP_DEST)/$(NUSMUK_NAME) install -p $(ABSTRACTIONS_SRC)/nusmuk/*-help.pd \ *************** *** 211,223 ****
# the destination-specific clean targets are in Makefile.buildlayout ! clean: install_clean cruft_clean
! #==============================================================================# ! # ! # LEGACY TARGETS ! # ! #==============================================================================# ! # this is a legacy clean target to get rid of cruft ! darwin_pkg_clean: ! -sudo rm -Rf installroot/ $(PKG_PREFIX)*.pkg/ ! -rm -f $(PKG_NAME).info 1 --- 225,229 ----
# the destination-specific clean targets are in Makefile.buildlayout ! clean: install_clean
! distclean: clean cruft_clean
--- NEW FILE: TODO ---
- simplify Makefile, making just "install" with subsections for each subdir.