Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[2256] CometVisu
|
From: <ma...@us...> - 2014-11-09 17:08:04
|
Revision: 2256
http://sourceforge.net/p/openautomation/code/2256
Author: mayerch
Date: 2014-11-09 17:08:01 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Final switch over to new build system.
(Additional advantage: it doesn't use a makefile anymore)
Modified Paths:
--------------
CometVisu/_support/make_release.sh
CometVisu/trunk/src/cometvisu.appcache
CometVisu/trunk/src/index.html
CometVisu/trunk/src/lib/templateengine.js
Removed Paths:
-------------
CometVisu/trunk/Makefile
Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh 2014-11-09 14:10:35 UTC (rev 2255)
+++ CometVisu/_support/make_release.sh 2014-11-09 17:08:01 UTC (rev 2256)
@@ -38,6 +38,8 @@
rm -rf /tmp/branches
fi
mkdir /tmp/branches
+ mkdir /tmp/branches/_support
+ cp ../_support/* /tmp/branches/_support
cp -r ../trunk /tmp/branches/$RELEASE_DIR
cd /tmp/branches
fi
@@ -48,7 +50,21 @@
sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/src/config/demo/visu_config_demo.xml
sed -i "s/comet_16x16_000000.png/comet_16x16_ff8000.png/" $RELEASE_DIR/src/index.html
cd $RELEASE_DIR
-make
+
+#make
+JS_ENGINE=`which node nodejs 2>/dev/null`
+TIMESTAMP=`date +%Y%m%d-%H%M%S`
+STATIC_FILES_PRE=$(cat src/cometvisu.appcache | sed '0,/T MODIFY!$/{//!b};d')
+STATIC_FILES_POST=$(cat src/cometvisu.appcache | sed '/^NETWORK:$/,/^$/{//!b};d')
+PLUGIN_FILES=$(find src | grep plugins | grep -E "structure_plugin.js|\.css" | sed 's%src/%%')
+DESIGN_FILES=$(find src | grep designs | grep -E "\.js|\.css|\.ttf" | sed 's%src/%%')
+mkdir -p ./release
+$JS_ENGINE ../_support/r.js -o build.js
+find release -path "*/.svn" -exec rm -rf {} +
+echo -e "$STATIC_FILES_PRE\n$DESIGN_FILES\n$PLUGIN_FILES\n\nNETWORK:\n$STATIC_FILES_POST" | \
+ sed "s/# Version.*/# Version $VERSION:$TIMESTAMP/" \
+ > release/cometvisu.appcache
+
chmod -R a+w src/config
chmod -R a+w release/config
cd ..
Deleted: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile 2014-11-09 14:10:35 UTC (rev 2255)
+++ CometVisu/trunk/Makefile 2014-11-09 17:08:01 UTC (rev 2256)
@@ -1,57 +0,0 @@
-PROJECT = "CometVisu"
-BUILD_DIR = build
-TARGET_DIR = release
-JS_ENGINE ?= `which node nodejs 2>/dev/null`
-LINT = ${JS_ENGINE} ${BUILD_DIR}/jslint.js
-
-VERSION = $(shell cat VERSION)
-YUIDOCPATH = /home/cm/devel/yuidoc
-
-SRC = src/designs/structure_pure.js
-
-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)
-
-all: docs build
-
-docs:
- ls -l
- ${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/"
-
-lint:
- ${LINT} ${SRC}
-
-release:
- chmod a+rw src/config/backup
- chmod a+rw src/config/visu_config*.xml
- mkdir -p ./release
- cp -rfp ./src/* ./release
- find release -path "*/.svn" -exec rm -rf {} +
-
-release/structure/pure.$(TIMESTAMP).js: release $(STRUCTURE_PURE_SRC)
- cat $(SRC_FILES) > release/structure/pure.$(TIMESTAMP).raw.js
- 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 $(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_FILES) | \
- sed 's%src/%release/%g' | xargs rm
-
-build: release/structure/pure.$(TIMESTAMP).js
-
-
-clean:
- rm -rf release
-
-.PHONY: lint docs build clean release
Modified: CometVisu/trunk/src/cometvisu.appcache
===================================================================
--- CometVisu/trunk/src/cometvisu.appcache 2014-11-09 14:10:35 UTC (rev 2255)
+++ CometVisu/trunk/src/cometvisu.appcache 2014-11-09 17:08:01 UTC (rev 2256)
@@ -3,6 +3,8 @@
CACHE:
index.html
+dependencies/require-2.1.15.min.js
+lib/templateengine.js
visu_config.xsd
# structure_pure will be inserted here during the release process !DON'T MODIFY!
dependencies/scrollable.min.js
@@ -24,7 +26,6 @@
lib/iconhandler.js
lib/compatibility.js
lib/cometvisu-client.js
-lib/templateengine.js
structure/pure/_common.js
structure/pure/break.js
structure/pure/designtoggle.js
Modified: CometVisu/trunk/src/index.html
===================================================================
--- CometVisu/trunk/src/index.html 2014-11-09 14:10:35 UTC (rev 2255)
+++ CometVisu/trunk/src/index.html 2014-11-09 17:08:01 UTC (rev 2256)
@@ -14,57 +14,6 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<script data-main="lib/templateengine" src="dependencies/require-2.1.15.min.js" type="text/javascript"></script>
- <!--
- <script type="text/javascript">
- $.ajaxSetup({ crossDomain: true, cache: 'true' != $.getUrlVar('forceReload') }); // make scripts debugable
- var ScriptsToInclude = [];
- ScriptsToInclude.push( "dependencies/jquery-ui.js" );
- ScriptsToInclude.push( "dependencies/strftime.js" );
- ScriptsToInclude.push( "dependencies/scrollable.js" );
- ScriptsToInclude.push( "dependencies/jquery.ui.touch-punch.js" );
- ScriptsToInclude.push( "dependencies/jquery.svg.min.js" );
- ScriptsToInclude.push( "lib/cometvisu-client.js" );
- ScriptsToInclude.push( "lib/iconhandler.js" );
- ScriptsToInclude.push( "structure/pure/_common.js" );
- ScriptsToInclude.push( "config/structure_custom.js" );
- ScriptsToInclude.push( "structure/pure/break.js" );
- ScriptsToInclude.push( "structure/pure/designtoggle.js" );
- ScriptsToInclude.push( "structure/pure/group.js" );
- ScriptsToInclude.push( "structure/pure/rgb.js" );
- ScriptsToInclude.push( "structure/pure/web.js" );
- ScriptsToInclude.push( "structure/pure/image.js" );
- ScriptsToInclude.push( "structure/pure/imagetrigger.js" );
- ScriptsToInclude.push( "structure/pure/include.js" );
- ScriptsToInclude.push( "structure/pure/info.js" );
- ScriptsToInclude.push( "structure/pure/infotrigger.js" );
- ScriptsToInclude.push( "structure/pure/line.js" );
- ScriptsToInclude.push( "structure/pure/multitrigger.js" );
- ScriptsToInclude.push( "structure/pure/navbar.js" );
- ScriptsToInclude.push( "structure/pure/page.js" );
- ScriptsToInclude.push( "structure/pure/pagejump.js" );
- ScriptsToInclude.push( "structure/pure/refresh.js" );
- ScriptsToInclude.push( "structure/pure/reload.js" );
- ScriptsToInclude.push( "structure/pure/slide.js" );
- ScriptsToInclude.push( "structure/pure/switch.js" );
- ScriptsToInclude.push( "structure/pure/text.js" );
- ScriptsToInclude.push( "structure/pure/toggle.js" );
- ScriptsToInclude.push( "structure/pure/trigger.js" );
- ScriptsToInclude.push( "structure/pure/pushbutton.js" );
- ScriptsToInclude.push( "structure/pure/urltrigger.js" );
- ScriptsToInclude.push( "structure/pure/unknown.js" );
- ScriptsToInclude.push( "structure/pure/audio.js" );
- ScriptsToInclude.push( "structure/pure/video.js" );
- ScriptsToInclude.push( "structure/pure/wgplugin_info.js" );
- ScriptsToInclude.push( "transforms/transform_default.js" );
- ScriptsToInclude.push( "transforms/transform_knx.js" );
- ScriptsToInclude.push( "transforms/transform_oh.js" );
- //---Disable 3D for 0.8--- ScriptsToInclude.push( "dependencies/Three.js" );
- //---Disable 3D for 0.8--- ScriptsToInclude.push( "dependencies/poly2tri.js" );
- //---Disable 3D for 0.8--- ScriptsToInclude.push( "dependencies/jsfloorplan.js" );
- ScriptsToInclude.push( "lib/templateengine.js" );
- $.includeScripts( ScriptsToInclude );
- </script>
- -->
<style type="text/css">
.loading { display: none; }
</style>
Modified: CometVisu/trunk/src/lib/templateengine.js
===================================================================
--- CometVisu/trunk/src/lib/templateengine.js 2014-11-09 14:10:35 UTC (rev 2255)
+++ CometVisu/trunk/src/lib/templateengine.js 2014-11-09 17:08:01 UTC (rev 2256)
@@ -24,6 +24,7 @@
//
require.config({
+ urlArgs: (typeof window === 'undefined') || window.location.href.indexOf('forceReload=true') < 0 ? '' : '_=' + (+new Date),
baseUrl: './',
waitSeconds: 30, // default: 7 seconds
paths: {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
