Mercurial Mercurial > hg > stx-libcomp / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make.proto
changeset 2837 9b10ec8f1036
parent 2821 6e6a32a3d216
child 2904 382fdbd6b93f 
--- a/Make.proto	Tue Feb 28 18:57:36 2012 +0100
+++ b/Make.proto	Tue Feb 28 18:59:28 2012 +0100
@@ -1,7 +1,7 @@
-# $Header: /cvs/stx/stx/libcomp/Make.proto,v 1.108 2012-02-16 23:21:38 vrany Exp $
+# $Header: /cvs/stx/stx/libcomp/Make.proto,v 1.109 2012-02-28 17:59:28 cg Exp $
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libcomp at 2012-02-16 23:21:18.266.
+# automagically generated from the projectDefinition: stx_libcomp at 2012-02-28 18:56:25.783.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -63,29 +63,17 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs::  
-
+pre_objs::  update-svn-revision
 
 
 
-# Update SVN revision in stx_libbasic3.st
-ifneq (,$(findstring .svn,$(wildcard .svn)))
-.svnversion: *.st
-	if [ -d .svn ]; then \
-		rev=$(shell svnversion -n); \
-		echo -n $$rev > .svnversion; \
-	else \
-		echo -n exported > .svnversion; \
+update-svn-revision:
+	if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
+		svnversion -n > .svnversion; \
+		sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
+			stx_libcomp.st; \
 	fi
-
-stx_libcomp.o: stx_libcomp.st .svnversion 
-	if [ -d .svn ]; then \
-		rev2=$(shell svnversion -n); \
-		sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"$$rev2\"\$$\"/g" $< > .stx_libcomp.svn.st; \
-	fi
-	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libcomp.svn $(O_RULE);
-	mv .stx_libcomp.svn.$(O) stx_libcomp.$(O) 
-endif
+.PHONY: update-svn-revision
 
 
 
@@ -123,6 +111,7 @@
 $(OUTDIR)BreakpointDescription.$(O) BreakpointDescription.$(H): BreakpointDescription.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)CompilationErrorHandler.$(O) CompilationErrorHandler.$(H): CompilationErrorHandler.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)DoNotShowCompilerWarningAgainActionQuery.$(O) DoNotShowCompilerWarningAgainActionQuery.$(H): DoNotShowCompilerWarningAgainActionQuery.st $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)DoNotShowCompilerWarningAgainForThisMethodActionQuery.$(O) DoNotShowCompilerWarningAgainForThisMethodActionQuery.$(H): DoNotShowCompilerWarningAgainForThisMethodActionQuery.st $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)InstrumentationContext.$(O) InstrumentationContext.$(H): InstrumentationContext.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)InstrumentationInfo.$(O) InstrumentationInfo.$(H): InstrumentationInfo.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)InstrumentedMethod.$(O) InstrumentedMethod.$(H): InstrumentedMethod.st $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -146,7 +135,7 @@
 $(OUTDIR)BreakpointNode.$(O) BreakpointNode.$(H): BreakpointNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)MessageNode.$(O) MessageNode.$(H): MessageNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ParseErrorNode.$(O) ParseErrorNode.$(H): ParseErrorNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Parser.$(O) Parser.$(H): Parser.st $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(STCHDR)
+$(OUTDIR)Parser.$(O) Parser.$(H): Parser.st $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(STCHDR)
 $(OUTDIR)PrimaryNode.$(O) PrimaryNode.$(H): PrimaryNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ProgramNode.$(O) ProgramNode.$(H): ProgramNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SelectorNode.$(O) SelectorNode.$(H): SelectorNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
hg/stx-libcomp