diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2012-09-11 10:21:50 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2012-09-11 10:21:50 +0000 |
| commit | 7db8da4168493440991fb832465aeeca2f8072e4 (patch) | |
| tree | c84d84993fbb73864e8708d52cd865c0ee47a59a | |
| parent | f1ecd5ff46a217ee9f4323a08f03e59a53ef551e (diff) | |
add SCM revision number to identify the related sources easier
Notes
Notes:
ignore: obsolete
| -rw-r--r-- | odk/pack/copying/dk.mk | 1 | ||||
| -rw-r--r-- | odk/pack/copying/makefile.mk | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/odk/pack/copying/dk.mk b/odk/pack/copying/dk.mk index fc12f67faae8..ec06352e81a4 100644 --- a/odk/pack/copying/dk.mk +++ b/odk/pack/copying/dk.mk @@ -22,3 +22,4 @@ # OpenOffice.org @@RELEASE@@ SDK dependent settings SDKVERSION=@@RELEASE@@ BUILDID=@@BUILDID@@ +SCM_REVISION=@@SCMREVISION@@
\ No newline at end of file diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index e62d7f4b7cef..fa09a3902734 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -30,6 +30,9 @@ TARGET=copying .INCLUDE: $(PRJ)/util/makefile.pmk #---------------------------------------------------------------- +SCM_ROOT_PATH=$(shell dirname $(SRC_ROOT)) +SCMREVISION=$(shell $(PERL) -I$(SOLARENV)/bin/modules -e "use SvnRevision; print SvnRevision::DetectRevisionId(\"$(SCM_ROOT_PATH)\")") + IDLLIST:={$(subst,/,/ $(shell @$(FIND) $(IDLOUT)/com -type f))} DESTIDLLIST={$(subst,$(IDLOUT),$(DESTDIRIDL) $(IDLLIST))} @@ -233,7 +236,7 @@ $(DESTDIRBIN)/addsym-macosx.sh : addsym-macosx.sh $(DESTDIRSETTINGS)/dk.mk : dk.mk @@-rm -f $@ -$(MKDIRHIER) $(@:d) - tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@ + tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/' -e 's/@@SCMREVISION@@/$(SCMREVISION)/'> $@ $(CONVERTTAGFLAG) : $(DOCUHTMLFILES) # $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES) |