Merge branch 'aggraef/purr-data-testing'

packages/win32_inno/Makefile

@@ -42,7 +42,11 @@ endif
 	@echo " "
 	@echo "win32_inno install succeeded!"
 
-build_pd:
+git_version: $(pd_src)/src/s_stuff.h.in
+	cd $(pd_src)/src/ && \
+	sed 's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|' s_stuff.h.in > s_stuff.h
+
+build_pd: git_version
 	cd $(pd_src)/src && $(MAKE) -f makefile.mingw
 
 pd_install: build_pd

pd/src/makefile.in

@@ -2,7 +2,7 @@
 # support.  Its safe on other platforms since gcc only checks this env var on
 # Apple's gcc.  <hans@at.or.at>
 ifeq ($(shell uname -s),Darwin)
-export MACOSX_DEPLOYMENT_TARGET = 10.3
+export MACOSX_DEPLOYMENT_TARGET = 10.4
 endif
 
 VPATH = ../obj:./
@@ -100,8 +100,10 @@ endif
 # AG: Pd-l2ork version number
 PD_L2ORK_VERSION := $(shell grep PD_L2ORK_VERSION m_pd.h | \
 	sed 's|^.define *PD_L2ORK_VERSION *"\(.*\)".*|\1|' )
-PD_BUILD_VERSION := $(shell grep PD_BUILD_VERSION s_stuff.h | \
-	sed 's|^.define *PD_BUILD_VERSION *"\(.*\)".*|\1|' )
+# This is replicated from packages/Makefile.buildlayout. XXXFIXME: Right now
+# you have to manually keep these two definitions in sync; if you edit one of
+# them, you should also edit the other.
+PD_BUILD_VERSION := $(shell git log -1 --format=%cd --date=short | sed -e 's/-//g')-rev.$(shell git rev-parse --short HEAD)
 
 #
 #  ------------------ targets ------------------------------------
@@ -241,18 +243,20 @@ extra-clean:
 clean: extra-clean local-clean
 
 distclean: clean
-	-rm -f config.cache config.log config.status makefile tags \
+	-rm -f s_stuff.h config.cache config.log config.status makefile tags \
 		autom4te.cache/output.* autom4te.cache/traces.* autom4te.cache/requests
-	-rmdir autom4te.cache
-	-rm -rf autom4te-*.cache
+	-rm -rf autom4te*.cache
 
 tags: $(SRC); ctags *.[ch]
 
 depend: makefile.dependencies
 
-makefile.dependencies: makefile
+makefile.dependencies: makefile s_stuff.h
 	$(CC) $(CPPFLAGS) -M $(SRC) > makefile.dependencies
 
+s_stuff.h: s_stuff.h.in
+	sed 's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|' $< > $@
+
 uninstall:
 	rm -f -r $(DESTDIR)$(libpddir)
 	rm -f $(DESTDIR)$(bindir)/@PDEXEC@

pd/src/makefile.mingw

@@ -148,6 +148,10 @@ PD_VERSION := $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION)
 ifneq ($(PD_TEST_VERSION),)
 	PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION)
 endif
+# AG: Pd-l2ork version number
+PD_L2ORK_VERSION := $(shell grep PD_L2ORK_VERSION m_pd.h | \
+	sed 's|^.define *PD_L2ORK_VERSION *"\(.*\)".*|\1|' )
+PD_BUILD_VERSION := $(shell git log -1 --format=%cd --date=short | sed -e 's/-//g')-rev.$(shell git rev-parse --short HEAD)
 
 
 #
@@ -161,6 +165,9 @@ all: config.h $(PDDLL) $(PDEXEC) pdsend.exe pdreceive.exe pd.com externs
 config.h: config.h.in
 	cp config.h.in config.h
 
+s_stuff.h: s_stuff.h.in
+	sed 's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|' $< > $@
+
 $(OBJ) : %.o : %.c
 	$(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $*.o $*.c 
 
@@ -294,7 +301,7 @@ install:  all
 		install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \
 	done
 	mv $(ABOUT_FILE) $(ABOUT_FILE).tmp
-	cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_VERSION)|' \
+	cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_L2ORK_VERSION) ($(PD_BUILD_VERSION))|' \
 		> $(ABOUT_FILE)
 	rm $(ABOUT_FILE).tmp
 	install -d $(libpddir)/extra
@@ -318,7 +325,7 @@ clean:
 	-rm -f makefile.dependencies
 
 distclean: clean
-	rm -rf -- config.cache config.log config.status makefile tags \
+	rm -rf -- s_stuff.h config.cache config.log config.status makefile tags \
 	     autom4te-*.cache
 
 tags: $(SRC) $(GSRC); ctags *.[ch]