[Openautomation-svn] SF.net SVN: openautomation:[1663] CometVisu

[<ma...@us...>]

Revision: 1663
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1663&view=rev
Author:   mayerch
Date:     2013-04-01 15:43:58 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
Remove bad release attempt.
Upload modified makefile for a better next attempt...

Modified Paths:
--------------
    CometVisu/trunk/Makefile

Removed Paths:
-------------
    CometVisu/branches/release_0.8.0~pre2/

Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile	2013-04-01 15:40:44 UTC (rev 1662)
+++ CometVisu/trunk/Makefile	2013-04-01 15:43:58 UTC (rev 1663)
@@ -10,6 +10,8 @@
 SRC = src/designs/structure_pure.js
 
 STRUCTURE_PURE_SRC = $(shell cat src/index.html | grep ScriptsToInclude.push | sed 's_ScriptsToInclude.push( "\(.*\)" );_src/\1_')
+SRC_FILES          = $(shell echo src/dependencies/jquery.js src/lib/compatibility.js $(STRUCTURE_PURE_SRC))
+APPCACHE_KILL_LIST = "$(shell echo $(SRC_FILES) | sed 's%src/%%g' | sed 's/ /|/g')"
 TIMESTAMP := $(shell date +%Y%m%d-%H%M%S)
 
 all: docs build
@@ -24,7 +26,6 @@
 	${LINT} ${SRC}
 
 release: 
-	ls -l
 	chmod a+rw src/config/backup
 	chmod a+rw src/config/visu_config*.xml
 	mkdir -p ./release
@@ -32,18 +33,18 @@
 	find release -path "*/.svn" -exec rm -rf {} +
 
 release/structure/pure.$(TIMESTAMP).js: release $(STRUCTURE_PURE_SRC)
-	cat src/dependencies/jquery.js src/lib/compatibility.js $(STRUCTURE_PURE_SRC) | \
+	cat $(SRC_FILES) | \
 	  yui-compressor --type js > release/structure/pure.$(TIMESTAMP).js
 	cat src/cometvisu.appcache | \
 	  sed 's/# Version.*/# Version $(VERSION):$(TIMESTAMP)/' | \
 	  sed 's%# structure_pure.*%structure/pure.$(TIMESTAMP).js%' | \
-	  grep -v -E "`echo $(STRUCTURE_PURE_SRC) | sed 's%src/%%g' | sed 's/ /|/g'`" \
+	  grep -v -E $(APPCACHE_KILL_LIST) \
 	  > release/cometvisu.appcache
 	cat src/index.html | \
 	  egrep -v "jquery.js|compatibility.js|make scripts debugable|ScriptsToInclude" | \
 	  sed 's%<script type="text/javascript">%<script src="structure/pure.$(TIMESTAMP).js" type="text/javascript">%' \
 	  > release/index.html
-	echo src/dependencies/jquery.js src/lib/compatibility.js $(STRUCTURE_PURE_SRC) | \
+	echo $(SRC_FILES) | \
 	  sed 's%src/%release/%g' | xargs rm
 	
 build: release/structure/pure.$(TIMESTAMP).js

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.