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

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

Revision: 1950
          http://sourceforge.net/p/openautomation/code/1950
Author:   mayerch
Date:     2013-10-20 14:54:42 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Update to the build scripts

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

Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh	2013-10-20 14:44:52 UTC (rev 1949)
+++ CometVisu/_support/make_release.sh	2013-10-20 14:54:42 UTC (rev 1950)
@@ -11,7 +11,7 @@
 fi
 
 RELEASE_DIR="release_$VERSION"
-SVN_CMD="svn"
+SVN_CMD="svn --username $USER --password $PASS"
 
 if [ x"$4" = "x-dry" ]; then
   echo "Dry run!"
@@ -24,7 +24,7 @@
 # NOTE: the script assumes to live at .../CometVisu/_support
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
-$SVN_CMD copy --username $USER --password $PASS -m "Creating release branch $VERSION" \
+$SVN_CMD copy -m "Creating release branch $VERSION" \
   "svn+ssh://$US...@sv.../p/openautomation/code/CometVisu/trunk" \
   "svn+ssh://$US...@sv.../p/openautomation/code/CometVisu/branches/$RELEASE_DIR"
 
@@ -43,9 +43,6 @@
 fi
 
 $SVN_CMD up
-$SVN_CMD propdel svn:ignore $RELEASE_DIR
-$SVN_CMD add $RELEASE_DIR/docs --depth infinity
-$SVN_CMD add $RELEASE_DIR/release --depth infinity
 echo $VERSION > $RELEASE_DIR/VERSION
 sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/src/config/visu_config.xml 
 sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/src/config/visu_config_demo.xml 
@@ -53,6 +50,9 @@
 cd $RELEASE_DIR
 make
 cd ..
+$SVN_CMD propdel svn:ignore $RELEASE_DIR
+$SVN_CMD add $RELEASE_DIR/docs --depth infinity
+$SVN_CMD add $RELEASE_DIR/release --depth infinity
 $SVN_CMD ci -m "New release: $VERSION" 
 
 tar -cj --exclude-vcs  -f CometVisu_$VERSION.tar.bz2 $RELEASE_DIR

Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile	2013-10-20 14:44:52 UTC (rev 1949)
+++ CometVisu/trunk/Makefile	2013-10-20 14:54:42 UTC (rev 1950)
@@ -9,7 +9,7 @@
 
 SRC = src/designs/structure_pure.js
 
-STRUCTURE_PURE_SRC = $(shell cat src/index.html | grep ScriptsToInclude.push | sed 's_ScriptsToInclude.push( "\(.*\)" );_src/\1_')
+STRUCTURE_PURE_SRC = $(shell cat src/index.html | grep ScriptsToInclude.push | grep -v "//" | 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)

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