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

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

Revision: 1488
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1488&view=rev
Author:   mayerch
Date:     2013-02-17 13:16:03 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
Update of the release scripts + infrastructure

Modified Paths:
--------------
    CometVisu/_support/make_release.sh
    CometVisu/trunk/Makefile
    CometVisu/trunk/src/cometvisu.appcache

Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh	2013-02-17 09:19:30 UTC (rev 1487)
+++ CometVisu/_support/make_release.sh	2013-02-17 13:16:03 UTC (rev 1488)
@@ -44,9 +44,9 @@
 
 $SVN_CMD up
 echo $VERSION > $RELEASE_DIR/VERSION
-sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/visu/visu_config.xml 
-sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/visu/visu_config_demo.xml 
-sed -i "s/comet_16x16_000000.png/comet_16x16_ff8000.png/" $RELEASE_DIR/visu/index.html
+sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/src/visu_config.xml 
+sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/src/visu_config_demo.xml 
+sed -i "s/comet_16x16_000000.png/comet_16x16_ff8000.png/" $RELEASE_DIR/src/index.html
 cd $RELEASE_DIR
 make
 cd ..

Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile	2013-02-17 09:19:30 UTC (rev 1487)
+++ CometVisu/trunk/Makefile	2013-02-17 13:16:03 UTC (rev 1488)
@@ -4,35 +4,18 @@
 JS_ENGINE ?= `which node nodejs 2>/dev/null`
 LINT = ${JS_ENGINE} ${BUILD_DIR}/jslint.js
 
-VERSION = `cat VERSION`
+VERSION = $(shell cat VERSION)
 YUIDOCPATH = /home/cm/devel/yuidoc
 
-SRC = visu/designs/structure_pure.js
+SRC = src/designs/structure_pure.js
 
-STRUCTURE_PURE = visu/structure/pure
-STRUCTURE_PURE_SRC = \
-  ${STRUCTURE_PURE}/_common.js\
-  ${STRUCTURE_PURE}/break.js\
-  ${STRUCTURE_PURE}/group.js\
-  ${STRUCTURE_PURE}/web.js\
-  ${STRUCTURE_PURE}/image.js\
-  ${STRUCTURE_PURE}/imagetrigger.js\
-  ${STRUCTURE_PURE}/include.js\
-  ${STRUCTURE_PURE}/info.js\
-  ${STRUCTURE_PURE}/infotrigger.js\
-  ${STRUCTURE_PURE}/line.js\
-  ${STRUCTURE_PURE}/multitrigger.js\
-  ${STRUCTURE_PURE}/page.js\
-  ${STRUCTURE_PURE}/slide.js\
-  ${STRUCTURE_PURE}/switch.js\
-  ${STRUCTURE_PURE}/text.js\
-  ${STRUCTURE_PURE}/toggle.js\
-  ${STRUCTURE_PURE}/trigger.js\
-  ${STRUCTURE_PURE}/unknown.js\
-  ${STRUCTURE_PURE}/video.js
+STRUCTURE_PURE_SRC = $(shell cat src/index.html | grep ScriptsToInclude.push | sed 's_ScriptsToInclude.push( "\(.*\)" );_src/\1_')
+TIMESTAMP := $(shell date +%Y%m%d-%H%M%S)
 
+all: docs build
+
 docs:
-	${YUIDOCPATH}/bin/yuidoc.py visu/lib visu/designs -p docs/parser -o docs -t build/template\
+	${YUIDOCPATH}/bin/yuidoc.py src/lib src/designs -p docs/parser -o docs -t build/template\
          -v ${VERSION} -C "The CometVisu developers (please consult the <a href=\"../AUTHORS\">AUTHORS</a> file)" --showprivate -m ${PROJECT}\
 	 -u "http://cometvisu.org/"
 
@@ -40,23 +23,24 @@
 	${LINT} ${SRC}
 
 release: 
-	cp -rfp visu release
+	cp -rfp src/* release
 	find release -path "*/.svn" -exec rm -rf {} +
 
-release/designs/structure_pure.js: release $(STRUCTURE_PURE_SRC)
-	cat $(STRUCTURE_PURE_SRC) > release/designs/structure_pure.js
-	cp visu/index.html release/index.html
-	cp visu/edit_config.html release/edit_config.html
-	for SRC_FILE in $^; do                                                                                       \
-		SRC2_FILE=`echo $$SRC_FILE | sed 's_visu/__'`;                                                       \
-		sed "s#.*<script src=\"$$SRC2_FILE\" type=\"text/javascript\"></script>.*##" -i release/index.html;  \
-	done
-	sed 's#<!-- Load the widgets: start -->#<script src="designs/structure_pure.js" type="text/javascript"></script>#' -i release/index.html
-	sed 's#<!-- Load the widgets: start -->#<script src="designs/structure_pure.js" type="text/javascript"></script>#' -i release/edit_config.html
+release/structure/pure.$(TIMESTAMP).js: release $(STRUCTURE_PURE_SRC)
+	cat src/dependencies/jquery.js src/lib/compatibility.js $(STRUCTURE_PURE_SRC) > release/structure/pure.$(TIMESTAMP).js
+	cat src/cometvisu.appcache | \
+	  sed 's/# Version.*/# Version $(VERSION):$(TIMESTAMP)/' | \
+	  sed 's%# structure_pure.*%structure/pure.$(TIMESTAMP).js%' \
+	  > 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
 	
-build: release/designs/structure_pure.js
+build: release/structure/pure.$(TIMESTAMP).js
 	
+	
 clean:
 	rm -rf release
 
-.PHONY: lint docs build
+.PHONY: lint docs build clean release

Modified: CometVisu/trunk/src/cometvisu.appcache
===================================================================
--- CometVisu/trunk/src/cometvisu.appcache	2013-02-17 09:19:30 UTC (rev 1487)
+++ CometVisu/trunk/src/cometvisu.appcache	2013-02-17 13:16:03 UTC (rev 1488)
@@ -3,6 +3,7 @@
 
 CACHE:
 index.html
+# structure_pure will be inserted here during the release process !DON'T MODIFY!
 icon/
 
 NETWORK:

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