Author: jsc
Date: Tue Sep 11 11:21:50 2012
New Revision: 1383356
URL: http://svn.apache.org/viewvc?rev=1383356&view=rev
Log:
add SCM revision number to identify the related sources easier
Modified:
incubator/ooo/trunk/main/odk/pack/copying/dk.mk
incubator/ooo/trunk/main/odk/pack/copying/makefile.mk
Modified: incubator/ooo/trunk/main/odk/pack/copying/dk.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/odk/pack/copying/dk.mk?rev=1383356&r1=1383355&r2=1383356&view=diff
==============================================================================
--- incubator/ooo/trunk/main/odk/pack/copying/dk.mk (original)
+++ incubator/ooo/trunk/main/odk/pack/copying/dk.mk Tue Sep 11 11:21:50 2012
@@ -22,3 +22,4 @@
# OpenOffice.org @@RELEASE@@ SDK dependent settings
SDKVERSION=@@RELEASE@@
BUILDID=@@BUILDID@@
+SCM_REVISION=@@SCMREVISION@@
\ No newline at end of file
Modified: incubator/ooo/trunk/main/odk/pack/copying/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/odk/pack/copying/makefile.mk?rev=1383356&r1=1383355&r2=1383356&view=diff
==============================================================================
--- incubator/ooo/trunk/main/odk/pack/copying/makefile.mk (original)
+++ incubator/ooo/trunk/main/odk/pack/copying/makefile.mk Tue Sep 11 11:21:50
2012
@@ -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-
$(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)
