Menu
▾
▴
openautomation-svn
|
From: <ma...@us...> - 2011-02-06 18:53:57
|
Revision: 289
http://openautomation.svn.sourceforge.net/openautomation/?rev=289&view=rev
Author: mayerch
Date: 2011-02-06 18:53:51 +0000 (Sun, 06 Feb 2011)
Log Message:
-----------
Preparaions for release 0.5.3
Modified Paths:
--------------
CometVisu/branches/release_0.5.3/ChangeLog
CometVisu/trunk/ChangeLog
Modified: CometVisu/branches/release_0.5.3/ChangeLog
===================================================================
--- CometVisu/branches/release_0.5.3/ChangeLog 2011-02-06 18:38:36 UTC (rev 288)
+++ CometVisu/branches/release_0.5.3/ChangeLog 2011-02-06 18:53:51 UTC (rev 289)
@@ -1,5 +1,5 @@
-HEAD
-====
+0.5.3
+=====
- New Design: "discreet_sand": dark text, light background
- New Design: "discreet_slim": more widgets per line for bigger screens
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2011-02-06 18:38:36 UTC (rev 288)
+++ CometVisu/trunk/ChangeLog 2011-02-06 18:53:51 UTC (rev 289)
@@ -1,3 +1,8 @@
+HEAD
+====
+
+-
+
0.5.3
=====
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-09 17:35:14
|
Revision: 434
http://openautomation.svn.sourceforge.net/openautomation/?rev=434&view=rev
Author: mayerch
Date: 2011-10-09 17:35:07 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
Update for release 0.6.0-RC1
Modified Paths:
--------------
CometVisu/branches/release_0.6.0-RC1/ChangeLog
CometVisu/trunk/ChangeLog
Modified: CometVisu/branches/release_0.6.0-RC1/ChangeLog
===================================================================
--- CometVisu/branches/release_0.6.0-RC1/ChangeLog 2011-10-09 17:29:41 UTC (rev 433)
+++ CometVisu/branches/release_0.6.0-RC1/ChangeLog 2011-10-09 17:35:07 UTC (rev 434)
@@ -1,5 +1,5 @@
-HEAD
-====
+0.6.0-RC1
+=========
- added frameborder and background to iframe
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2011-10-09 17:29:41 UTC (rev 433)
+++ CometVisu/trunk/ChangeLog 2011-10-09 17:35:07 UTC (rev 434)
@@ -1,6 +1,9 @@
HEAD
====
+0.6.0-RC1
+=========
+
- added frameborder and background to iframe
0.6.0-pre1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 17:44:02
|
Revision: 491
http://openautomation.svn.sourceforge.net/openautomation/?rev=491&view=rev
Author: mayerch
Date: 2011-10-31 17:43:56 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Alter ChangeLog to show release 0.6.0-RC2
Modified Paths:
--------------
CometVisu/branches/release_0.6.0-RC2/ChangeLog
CometVisu/trunk/ChangeLog
Modified: CometVisu/branches/release_0.6.0-RC2/ChangeLog
===================================================================
--- CometVisu/branches/release_0.6.0-RC2/ChangeLog 2011-10-31 17:40:03 UTC (rev 490)
+++ CometVisu/branches/release_0.6.0-RC2/ChangeLog 2011-10-31 17:43:56 UTC (rev 491)
@@ -1,5 +1,5 @@
-HEAD
-====
+0.6.0-RC2
+=========
- New Feature: Show version in status bar
- New Feature: toogle-widget (switch toggling multiple values based on mapping)
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2011-10-31 17:40:03 UTC (rev 490)
+++ CometVisu/trunk/ChangeLog 2011-10-31 17:43:56 UTC (rev 491)
@@ -1,6 +1,11 @@
HEAD
====
+-
+
+0.6.0-RC2
+=========
+
- New Feature: Show version in status bar
- New Feature: toogle-widget (switch toggling multiple values based on mapping)
- New Feature: jqclock - a clock widget with statusbar-support
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-11-27 21:44:11
|
Revision: 549
http://openautomation.svn.sourceforge.net/openautomation/?rev=549&view=rev
Author: mayerch
Date: 2011-11-27 21:44:05 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Release notes for 0.6.1
Modified Paths:
--------------
CometVisu/branches/release_0.6.1/ChangeLog
CometVisu/trunk/ChangeLog
Modified: CometVisu/branches/release_0.6.1/ChangeLog
===================================================================
--- CometVisu/branches/release_0.6.1/ChangeLog 2011-11-27 21:32:53 UTC (rev 548)
+++ CometVisu/branches/release_0.6.1/ChangeLog 2011-11-27 21:44:05 UTC (rev 549)
@@ -1,3 +1,9 @@
+0.6.1
+=====
+
+The identically to release 0.6.0
+This additional release is due to technical reasons.
+
0.6.0
=====
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2011-11-27 21:32:53 UTC (rev 548)
+++ CometVisu/trunk/ChangeLog 2011-11-27 21:44:05 UTC (rev 549)
@@ -1,3 +1,14 @@
+HEAD
+====
+
+-
+
+0.6.1
+=====
+
+The identically to release 0.6.0
+This additional release is due to technical reasons.
+
0.6.0
=====
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2013-02-17 13:16:20
|
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.
|
|
From: <ma...@us...> - 2013-02-20 21:48:50
|
Revision: 1514
http://openautomation.svn.sourceforge.net/openautomation/?rev=1514&view=rev
Author: mayerch
Date: 2013-02-20 21:48:41 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
Remove bad development releases.
Fix build scripts.
Modified Paths:
--------------
CometVisu/_support/make_release.sh
CometVisu/trunk/Makefile
Removed Paths:
-------------
CometVisu/branches/release_0.8.0~pre1/
CometVisu/branches/release_0.8.0~pre2/
Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh 2013-02-20 21:23:54 UTC (rev 1513)
+++ CometVisu/_support/make_release.sh 2013-02-20 21:48:41 UTC (rev 1514)
@@ -28,6 +28,8 @@
"https://openautomation.svn.sourceforge.net/svnroot/openautomation/CometVisu/trunk" \
"https://openautomation.svn.sourceforge.net/svnroot/openautomation/CometVisu/branches/$RELEASE_DIR"
+$SVN_CMD propdel svn:ignore ../branches/$RELEASE_DIR
+
# NOTE: the script assumes that the branches live at .../CometVisu/branches
cd ../branches
Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile 2013-02-20 21:23:54 UTC (rev 1513)
+++ CometVisu/trunk/Makefile 2013-02-20 21:48:41 UTC (rev 1514)
@@ -15,6 +15,7 @@
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/"
@@ -23,9 +24,11 @@
${LINT} ${SRC}
release:
+ ls -l
chmod a+rw src/backup
chmod a+rw src/visu_config*.xml
- cp -rfp src/* release
+ mkdir ./release
+ cp -rfp ./src ./release
find release -path "*/.svn" -exec rm -rf {} +
release/structure/pure.$(TIMESTAMP).js: release $(STRUCTURE_PURE_SRC)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2013-04-01 15:44:08
|
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.
|
|
From: <ma...@us...> - 2013-10-20 19:17:37
|
Revision: 1953
http://sourceforge.net/p/openautomation/code/1953
Author: mayerch
Date: 2013-10-20 19:17:33 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Fix bug that prevented concatinating of the source files - in the trunk and in the release 0.8.0-RC1
Modified Paths:
--------------
CometVisu/branches/release_0.8.0-RC1/release/cometvisu.appcache
CometVisu/branches/release_0.8.0-RC1/release/structure/pure.20131020-165857.js
CometVisu/trunk/Makefile
CometVisu/trunk/src/cometvisu.appcache
CometVisu/trunk/src/lib/cometvisu-client.js
Modified: CometVisu/branches/release_0.8.0-RC1/release/cometvisu.appcache
===================================================================
--- CometVisu/branches/release_0.8.0-RC1/release/cometvisu.appcache 2013-10-20 15:01:29 UTC (rev 1952)
+++ CometVisu/branches/release_0.8.0-RC1/release/cometvisu.appcache 2013-10-20 19:17:33 UTC (rev 1953)
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# Version 0.8.0-RC1:20131020-165857
+# Version 0.8.0-RC1:20131020-165857.1
CACHE:
index.html
Modified: CometVisu/branches/release_0.8.0-RC1/release/structure/pure.20131020-165857.js
===================================================================
--- CometVisu/branches/release_0.8.0-RC1/release/structure/pure.20131020-165857.js 2013-10-20 15:01:29 UTC (rev 1952)
+++ CometVisu/branches/release_0.8.0-RC1/release/structure/pure.20131020-165857.js 2013-10-20 19:17:33 UTC (rev 1953)
@@ -48,4 +48,4 @@
* https://github.com/furf/jquery-ui-touch-punch
*
*/
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2013-11-01 22:43:14
|
Revision: 1978
http://sourceforge.net/p/openautomation/code/1978
Author: mayerch
Date: 2013-11-01 22:43:12 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
Update of release script and removal of premature CV-0.8.0-RC2
Modified Paths:
--------------
CometVisu/_support/make_release.sh
Removed Paths:
-------------
CometVisu/branches/release_0.8.0-RC2/
Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh 2013-11-01 21:45:43 UTC (rev 1977)
+++ CometVisu/_support/make_release.sh 2013-11-01 22:43:12 UTC (rev 1978)
@@ -49,6 +49,8 @@
sed -i "s/comet_16x16_000000.png/comet_16x16_ff8000.png/" $RELEASE_DIR/src/index.html
cd $RELEASE_DIR
make
+chmod -R a+w src/config
+chmod -R a+w release/config
cd ..
$SVN_CMD propdel svn:ignore $RELEASE_DIR
$SVN_CMD add $RELEASE_DIR/docs --depth infinity
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-11-30 21:53:17
|
Revision: 551
http://openautomation.svn.sourceforge.net/openautomation/?rev=551&view=rev
Author: mayerch
Date: 2011-11-30 21:53:11 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
As discussed: last minute change for 0.6.1 and "backport" to trunk: remove version information in visu_config.xml (but leave it in visu_config_demo.xml)
Modified Paths:
--------------
CometVisu/branches/release_0.6.1/visu/visu_config.xml
CometVisu/trunk/visu/visu_config.xml
Modified: CometVisu/branches/release_0.6.1/visu/visu_config.xml
===================================================================
--- CometVisu/branches/release_0.6.1/visu/visu_config.xml 2011-11-29 16:33:08 UTC (rev 550)
+++ CometVisu/branches/release_0.6.1/visu/visu_config.xml 2011-11-30 21:53:11 UTC (rev 551)
@@ -59,7 +59,6 @@
]]></status>
<status type="html"><![CDATA[
- <a href="check_config.php">Check Config</a>
- <div style="float:right;padding-right:0.5em">Version: 0.6.1</div>
]]></status>
</statusbar>
</meta>
Modified: CometVisu/trunk/visu/visu_config.xml
===================================================================
--- CometVisu/trunk/visu/visu_config.xml 2011-11-29 16:33:08 UTC (rev 550)
+++ CometVisu/trunk/visu/visu_config.xml 2011-11-30 21:53:11 UTC (rev 551)
@@ -59,7 +59,6 @@
]]></status>
<status type="html"><![CDATA[
- <a href="check_config.php">Check Config</a>
- <div style="float:right;padding-right:0.5em">Version: SVN</div>
]]></status>
</statusbar>
</meta>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2013-02-16 15:45:47
|
Revision: 1478
http://openautomation.svn.sourceforge.net/openautomation/?rev=1478&view=rev
Author: mayerch
Date: 2013-02-16 15:45:40 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
Prepare infrastructure for a new release.
NOTE: This also required to move the well known directory "visu" to the new name "src" (The content is unmodified to the last revision!)
Modified Paths:
--------------
CometVisu/trunk/INSTALL
CometVisu/trunk/Makefile
Added Paths:
-----------
CometVisu/_support/
CometVisu/_support/_readme.txt
CometVisu/_support/make_release.sh
CometVisu/trunk/src/
Removed Paths:
-------------
CometVisu/trunk/visu/
Added: CometVisu/_support/_readme.txt
===================================================================
--- CometVisu/_support/_readme.txt (rev 0)
+++ CometVisu/_support/_readme.txt 2013-02-16 15:45:40 UTC (rev 1478)
@@ -0,0 +1,7 @@
+This directory contains little scripts that help to create e.g. a new
+release of the CometVisu.
+
+The are not needed to run the CometVisu and also don't belong to a
+release of the CometVisu.
+
+Licence is GPLv3 for the full directory, copyright by Christian Mayer.
Added: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh (rev 0)
+++ CometVisu/_support/make_release.sh 2013-02-16 15:45:40 UTC (rev 1478)
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+VERSION="$1"
+USER="$2"
+PASS="$3"
+
+if [[ -z $PASS ]]; then
+ echo "Call script with the new version name as parameter like
+ $0 \"1.2.3\" \"MySVNUserName\" \"MySVNPass\" [-dry]"
+ exit
+fi
+
+RELEASE_DIR="release_$VERSION"
+SVN_CMD="svn"
+
+if [ x"$4" = "x-dry" ]; then
+ echo "Dry run!"
+ SVN_CMD="echo svn"
+fi
+
+echo "Creating Release: '$VERSION' in '$RELEASE_DIR'"
+
+# Make sure we start at the location of this script
+# 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" \
+ "https://openautomation.svn.sourceforge.net/svnroot/openautomation/CometVisu/trunk" \
+ "https://openautomation.svn.sourceforge.net/svnroot/openautomation/CometVisu/branches/$RELEASE_DIR"
+
+# NOTE: the script assumes that the branches live at .../CometVisu/branches
+cd ../branches
+
+if [ x"$4" = "x-dry" ]; then
+ # dry run? Then fake copy in /tmp/branches
+ if [ -e /tmp/branches ]; then
+ echo "/tmp/branches does already exist - deleting it..."
+ rm -rf /tmp/branches
+ fi
+ mkdir /tmp/branches
+ cp -r ../trunk /tmp/branches/$RELEASE_DIR
+ cd /tmp/branches
+fi
+
+$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
+cd $RELEASE_DIR
+make
+cd ..
+$SVN_CMD ci -m "New release: $VERSION"
+
+tar -cj --exclude-vcs -f CometVisu_$VERSION.tar.bz2 $RELEASE_DIR
+
Property changes on: CometVisu/_support/make_release.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: CometVisu/trunk/INSTALL
===================================================================
--- CometVisu/trunk/INSTALL 2013-02-16 13:55:26 UTC (rev 1477)
+++ CometVisu/trunk/INSTALL 2013-02-16 15:45:40 UTC (rev 1478)
@@ -1,3 +1,9 @@
The installation of the CometVisu is very simple. You only need
-to copy the directroy "visu" on your web server and edit the
+to copy the directroy "release" on your web server and edit the
file "visu_config.xml" to match your local requirements.
+
+Or if you want to see the unmodified (and thus unminimized) sources
+and run those (e.g. debugging) you can copy the directroy "src"
+onto you web server.
+But then you should try the development version out of the SVN
+repository anyway.
\ No newline at end of file
Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile 2013-02-16 13:55:26 UTC (rev 1477)
+++ CometVisu/trunk/Makefile 2013-02-16 15:45:40 UTC (rev 1478)
@@ -33,7 +33,7 @@
docs:
${YUIDOCPATH}/bin/yuidoc.py visu/lib visu/designs -p docs/parser -o docs -t build/template\
- -v ${VERSION} -C "The CometVisu developers (please consult the AUTHORS file)" --showprivate -m ${PROJECT}\
+ -v ${VERSION} -C "The CometVisu developers (please consult the <a href=\"../AUTHORS\">AUTHORS</a> file)" --showprivate -m ${PROJECT}\
-u "http://cometvisu.org/"
lint:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2013-02-21 19:59:45
|
Revision: 1523
http://openautomation.svn.sourceforge.net/openautomation/?rev=1523&view=rev
Author: mayerch
Date: 2013-02-21 19:59:38 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
New try at the release scripts
Modified Paths:
--------------
CometVisu/_support/make_release.sh
CometVisu/trunk/Makefile
Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh 2013-02-21 19:14:55 UTC (rev 1522)
+++ CometVisu/_support/make_release.sh 2013-02-21 19:59:38 UTC (rev 1523)
@@ -28,8 +28,6 @@
"https://openautomation.svn.sourceforge.net/svnroot/openautomation/CometVisu/trunk" \
"https://openautomation.svn.sourceforge.net/svnroot/openautomation/CometVisu/branches/$RELEASE_DIR"
-$SVN_CMD propdel svn:ignore ../branches/$RELEASE_DIR
-
# NOTE: the script assumes that the branches live at .../CometVisu/branches
cd ../branches
@@ -45,6 +43,7 @@
fi
$SVN_CMD up
+$SVN_CMD propdel svn:ignore $RELEASE_DIR
echo $VERSION > $RELEASE_DIR/VERSION
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
Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile 2013-02-21 19:14:55 UTC (rev 1522)
+++ CometVisu/trunk/Makefile 2013-02-21 19:59:38 UTC (rev 1523)
@@ -27,8 +27,8 @@
ls -l
chmod a+rw src/backup
chmod a+rw src/visu_config*.xml
- mkdir ./release
- cp -rfp ./src ./release
+ mkdir -p ./release
+ cp -rfp ./src/* ./release
find release -path "*/.svn" -exec rm -rf {} +
release/structure/pure.$(TIMESTAMP).js: release $(STRUCTURE_PURE_SRC)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2013-03-31 21:22:59
|
Revision: 1650
http://openautomation.svn.sourceforge.net/openautomation/?rev=1650&view=rev
Author: mayerch
Date: 2013-03-31 21:22:51 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
New release scripts - and delete the last test release just made by the old version...
Modified Paths:
--------------
CometVisu/_support/make_release.sh
CometVisu/trunk/Makefile
Removed Paths:
-------------
CometVisu/branches/release_0.8.0~pre2/
Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh 2013-03-31 21:17:55 UTC (rev 1649)
+++ CometVisu/_support/make_release.sh 2013-03-31 21:22:51 UTC (rev 1650)
@@ -44,6 +44,8 @@
$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/visu_config.xml
sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/src/visu_config_demo.xml
Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile 2013-03-31 21:17:55 UTC (rev 1649)
+++ CometVisu/trunk/Makefile 2013-03-31 21:22:51 UTC (rev 1650)
@@ -25,8 +25,8 @@
release:
ls -l
- chmod a+rw src/backup
- chmod a+rw src/visu_config*.xml
+ 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 {} +
@@ -42,6 +42,8 @@
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) | \
+ 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.
|
|
From: <ma...@us...> - 2013-10-20 14:21:59
|
Revision: 1945
http://sourceforge.net/p/openautomation/code/1945
Author: mayerch
Date: 2013-10-20 14:21:56 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Preparation for CometVisu 0.8.0 Release Candidate #1: 0.8.0-RC1
Modified Paths:
--------------
CometVisu/_support/make_release.sh
CometVisu/trunk/ChangeLog
Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh 2013-10-19 20:11:26 UTC (rev 1944)
+++ CometVisu/_support/make_release.sh 2013-10-20 14:21:56 UTC (rev 1945)
@@ -47,8 +47,8 @@
$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/visu_config.xml
-sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/src/visu_config_demo.xml
+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
sed -i "s/comet_16x16_000000.png/comet_16x16_ff8000.png/" $RELEASE_DIR/src/index.html
cd $RELEASE_DIR
make
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2013-10-19 20:11:26 UTC (rev 1944)
+++ CometVisu/trunk/ChangeLog 2013-10-20 14:21:56 UTC (rev 1945)
@@ -1,5 +1,5 @@
-HEAD (up to commit #1943)
-=========================
+0.8.0-RC1
+=========
- Lots of bug fixes
- Code clean up
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2013-10-20 14:54:45
|
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.
|
|
From: <ma...@us...> - 2014-11-09 13:52:44
|
Revision: 2254
http://sourceforge.net/p/openautomation/code/2254
Author: mayerch
Date: 2014-11-09 13:52:37 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Necessary file for new build system (based an RequireJS's r.js)
Added Paths:
-----------
CometVisu/_support/css-builder.js
CometVisu/_support/normalize.js
CometVisu/_support/r.js
CometVisu/trunk/build.js
Added: CometVisu/_support/css-builder.js
===================================================================
--- CometVisu/_support/css-builder.js (rev 0)
+++ CometVisu/_support/css-builder.js 2014-11-09 13:52:37 UTC (rev 2254)
@@ -0,0 +1,200 @@
+define(['require', './normalize'], function(req, normalize) {
+ var cssAPI = {};
+
+ var isWindows = !!process.platform.match(/^win/);
+
+ function compress(css) {
+ if (config.optimizeCss == 'none') {
+ return css;
+ }
+ if (typeof process !== "undefined" && process.versions && !!process.versions.node && require.nodeRequire) {
+ try {
+ var csso = require.nodeRequire('csso');
+ }
+ catch(e) {
+ console.log('Compression module not installed. Use "npm install csso -g" to enable.');
+ return css;
+ }
+ var csslen = css.length;
+ try {
+ css = csso.justDoIt(css);
+ }
+ catch(e) {
+ console.log('Compression failed due to a CSS syntax error.');
+ return css;
+ }
+ console.log('Compressed CSS output to ' + Math.round(css.length / csslen * 100) + '%.');
+ return css;
+ }
+ console.log('Compression not supported outside of nodejs environments.');
+ return css;
+ }
+
+ //load file code - stolen from text plugin
+ function loadFile(path) {
+ if (typeof process !== "undefined" && process.versions && !!process.versions.node && require.nodeRequire) {
+ var fs = require.nodeRequire('fs');
+ var file = fs.readFileSync(path, 'utf8');
+ if (file.indexOf('\uFEFF') === 0)
+ return file.substring(1);
+ return file;
+ }
+ else {
+ var file = new java.io.File(path),
+ lineSeparator = java.lang.System.getProperty("line.separator"),
+ input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), 'utf-8')),
+ stringBuffer, line;
+ try {
+ stringBuffer = new java.lang.StringBuffer();
+ line = input.readLine();
+ if (line && line.length() && line.charAt(0) === 0xfeff)
+ line = line.substring(1);
+ stringBuffer.append(line);
+ while ((line = input.readLine()) !== null) {
+ stringBuffer.append(lineSeparator).append(line);
+ }
+ return String(stringBuffer.toString());
+ }
+ finally {
+ input.close();
+ }
+ }
+ }
+
+
+ function saveFile(path, data) {
+ if (typeof process !== "undefined" && process.versions && !!process.versions.node && require.nodeRequire) {
+ var fs = require.nodeRequire('fs');
+ fs.writeFileSync(path, data, 'utf8');
+ }
+ else {
+ var content = new java.lang.String(data);
+ var output = new java.io.BufferedWriter(new java.io.OutputStreamWriter(new java.io.FileOutputStream(path), 'utf-8'));
+
+ try {
+ output.write(content, 0, content.length());
+ output.flush();
+ }
+ finally {
+ output.close();
+ }
+ }
+ }
+
+ //when adding to the link buffer, paths are normalised to the baseUrl
+ //when removing from the link buffer, paths are normalised to the output file path
+ function escape(content) {
+ return content.replace(/(["'\\])/g, '\\$1')
+ .replace(/[\f]/g, "\\f")
+ .replace(/[\b]/g, "\\b")
+ .replace(/[\n]/g, "\\n")
+ .replace(/[\t]/g, "\\t")
+ .replace(/[\r]/g, "\\r");
+ }
+
+ // NB add @media query support for media imports
+ var importRegEx = /@import\s*(url)?\s*(('([^']*)'|"([^"]*)")|\(('([^']*)'|"([^"]*)"|([^\)]*))\))\s*;?/g;
+ var absUrlRegEx = /^([^\:\/]+:\/)?\//;
+
+
+ var siteRoot;
+
+ var baseParts = req.toUrl('base_url').split('/');
+ baseParts[baseParts.length - 1] = '';
+ var baseUrl = baseParts.join('/');
+
+ var curModule = 0;
+ var config;
+
+ var layerBuffer = [];
+ var cssBuffer = {};
+
+ cssAPI.load = function(name, req, load, _config) {
+
+ //store config
+ config = config || _config;
+
+ if (!siteRoot) {
+ siteRoot = path.resolve(config.dir || path.dirname(config.out), config.siteRoot || '.') + '/';
+ if (isWindows)
+ siteRoot = siteRoot.replace(/\\/g, '/');
+ }
+
+ //external URLS don't get added (just like JS requires)
+ if (name.match(absUrlRegEx))
+ return load();
+
+ var fileUrl = req.toUrl(name + '.css');
+ if (isWindows)
+ fileUrl = fileUrl.replace(/\\/g, '/');
+
+ // rebase to the output directory if based on the source directory;
+ // baseUrl points always to the output directory, fileUrl only if
+ // it is not prefixed by a computed path (relative too)
+ var fileSiteUrl = fileUrl;
+ if (fileSiteUrl.indexOf(baseUrl) < 0) {
+ var appRoot = req.toUrl(config.appDir);
+ if (isWindows)
+ appRoot = appRoot.replace(/\\/g, '/');
+ if (fileSiteUrl.indexOf(appRoot) == 0)
+ fileSiteUrl = siteRoot + fileSiteUrl.substring(appRoot.length);
+ }
+
+ //add to the buffer
+ cssBuffer[name] = normalize(loadFile(fileUrl), fileSiteUrl, siteRoot);
+
+ load();
+ }
+
+ cssAPI.normalize = function(name, normalize) {
+ if (name.substr(name.length - 4, 4) == '.css')
+ name = name.substr(0, name.length - 4);
+ return normalize(name);
+ }
+
+ cssAPI.write = function(pluginName, moduleName, write, parse) {
+ //external URLS don't get added (just like JS requires)
+ if (moduleName.match(absUrlRegEx))
+ return;
+
+ layerBuffer.push(cssBuffer[moduleName]);
+
+ if (config.buildCSS != false)
+ write.asModule(pluginName + '!' + moduleName, 'define(function(){})');
+ }
+
+ cssAPI.onLayerEnd = function(write, data) {
+ if (config.separateCSS && config.IESelectorLimit)
+ throw 'RequireCSS: separateCSS option is not compatible with ensuring the IE selector limit';
+
+ if (config.separateCSS) {
+ var outPath = data.path.replace(/(\.js)?$/, '.css');
+ console.log('Writing CSS! file: ' + outPath + '\n');
+
+ var css = layerBuffer.join('');
+
+ process.nextTick(function() {
+ if (fs.existsSync(outPath)) {
+ css = css + fs.readFileSync(outPath, {encoding: 'utf8'});
+ }
+ saveFile(outPath, compress(css));
+ });
+
+ }
+ else if (config.buildCSS != false) {
+ var styles = config.IESelectorLimit ? layerBuffer : [layerBuffer.join('')];
+ for (var i = 0; i < styles.length; i++) {
+ if (styles[i] == '')
+ return;
+ write(
+ "(function(c){var d=document,a='appendChild',i='styleSheet',s=d.createElement('style');s.type='text/css';d.getElementsByTagName('head')[0][a](s);s[i]?s[i].cssText=c:s[a](d.createTextNode(c));})\n"
+ + "('" + escape(compress(styles[i])) + "');\n"
+ );
+ }
+ }
+ //clear layer buffer for next layer
+ layerBuffer = [];
+ }
+
+ return cssAPI;
+});
Added: CometVisu/_support/normalize.js
===================================================================
--- CometVisu/_support/normalize.js (rev 0)
+++ CometVisu/_support/normalize.js 2014-11-09 13:52:37 UTC (rev 2254)
@@ -0,0 +1,141 @@
+//>>excludeStart('excludeRequireCss', pragmas.excludeRequireCss)
+/*
+ * css.normalize.js
+ *
+ * CSS Normalization
+ *
+ * CSS paths are normalized based on an optional basePath and the RequireJS config
+ *
+ * Usage:
+ * normalize(css, fromBasePath, toBasePath);
+ *
+ * css: the stylesheet content to normalize
+ * fromBasePath: the absolute base path of the css relative to any root (but without ../ backtracking)
+ * toBasePath: the absolute new base path of the css relative to the same root
+ *
+ * Absolute dependencies are left untouched.
+ *
+ * Urls in the CSS are picked up by regular expressions.
+ * These will catch all statements of the form:
+ *
+ * url(*)
+ * url('*')
+ * url("*")
+ *
+ * @import '*'
+ * @import "*"
+ *
+ * (and so also @import url(*) variations)
+ *
+ * For urls needing normalization
+ *
+ */
+
+define(function() {
+
+ // regular expression for removing double slashes
+ // eg http://www.example.com//my///url/here -> http://www.example.com/my/url/here
+ var slashes = /([^:])\/+/g
+ var removeDoubleSlashes = function(uri) {
+ return uri.replace(slashes, '$1/');
+ }
+
+ // given a relative URI, and two absolute base URIs, convert it from one base to another
+ var protocolRegEx = /[^\:\/]*:\/\/([^\/])*/;
+ var absUrlRegEx = /^(\/|data:)/;
+ function convertURIBase(uri, fromBase, toBase) {
+ if (uri.match(absUrlRegEx) || uri.match(protocolRegEx))
+ return uri;
+ uri = removeDoubleSlashes(uri);
+ // if toBase specifies a protocol path, ensure this is the same protocol as fromBase, if not
+ // use absolute path at fromBase
+ var toBaseProtocol = toBase.match(protocolRegEx);
+ var fromBaseProtocol = fromBase.match(protocolRegEx);
+ if (fromBaseProtocol && (!toBaseProtocol || toBaseProtocol[1] != fromBaseProtocol[1] || toBaseProtocol[2] != fromBaseProtocol[2]))
+ return absoluteURI(uri, fromBase);
+
+ else {
+ return relativeURI(absoluteURI(uri, fromBase), toBase);
+ }
+ };
+
+ // given a relative URI, calculate the absolute URI
+ function absoluteURI(uri, base) {
+ if (uri.substr(0, 2) == './')
+ uri = uri.substr(2);
+
+ // absolute urls are left in tact
+ if (uri.match(absUrlRegEx) || uri.match(protocolRegEx))
+ return uri;
+
+ var baseParts = base.split('/');
+ var uriParts = uri.split('/');
+
+ baseParts.pop();
+
+ while (curPart = uriParts.shift())
+ if (curPart == '..')
+ baseParts.pop();
+ else
+ baseParts.push(curPart);
+
+ return baseParts.join('/');
+ };
+
+
+ // given an absolute URI, calculate the relative URI
+ function relativeURI(uri, base) {
+
+ // reduce base and uri strings to just their difference string
+ var baseParts = base.split('/');
+ baseParts.pop();
+ base = baseParts.join('/') + '/';
+ i = 0;
+ while (base.substr(i, 1) == uri.substr(i, 1))
+ i++;
+ while (base.substr(i, 1) != '/')
+ i--;
+ base = base.substr(i + 1);
+ uri = uri.substr(i + 1);
+
+ // each base folder difference is thus a backtrack
+ baseParts = base.split('/');
+ var uriParts = uri.split('/');
+ out = '';
+ while (baseParts.shift())
+ out += '../';
+
+ // finally add uri parts
+ while (curPart = uriParts.shift())
+ out += curPart + '/';
+
+ return out.substr(0, out.length - 1);
+ };
+
+ var normalizeCSS = function(source, fromBase, toBase) {
+
+ fromBase = removeDoubleSlashes(fromBase);
+ toBase = removeDoubleSlashes(toBase);
+
+ var urlRegEx = /@import\s*("([^"]*)"|'([^']*)')|url\s*\((?!#)\s*(\s*"([^"]*)"|'([^']*)'|[^\)]*\s*)\s*\)/ig;
+ var result, url, source;
+
+ while (result = urlRegEx.exec(source)) {
+ url = result[3] || result[2] || result[5] || result[6] || result[4];
+ var newUrl;
+ newUrl = convertURIBase(url, fromBase, toBase);
+ var quoteLen = result[5] || result[6] ? 1 : 0;
+ source = source.substr(0, urlRegEx.lastIndex - url.length - quoteLen - 1) + newUrl + source.substr(urlRegEx.lastIndex - quoteLen - 1);
+ urlRegEx.lastIndex = urlRegEx.lastIndex + (newUrl.length - url.length);
+ }
+
+ return source;
+ };
+
+ normalizeCSS.convertURIBase = convertURIBase;
+ normalizeCSS.absoluteURI = absoluteURI;
+ normalizeCSS.relativeURI = relativeURI;
+
+ return normalizeCSS;
+});
+//>>excludeEnd('excludeRequireCss')
Added: CometVisu/_support/r.js
===================================================================
--- CometVisu/_support/r.js (rev 0)
+++ CometVisu/_support/r.js 2014-11-09 13:52:37 UTC (rev 2254)
@@ -0,0 +1,27993 @@
+/**
+ * @license r.js 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/requirejs for details
+ */
+
+/*
+ * This is a bootstrap script to allow running RequireJS in the command line
+ * in either a Java/Rhino or Node environment. It is modified by the top-level
+ * dist.js file to inject other files to completely enable this file. It is
+ * the shell of the r.js file.
+ */
+
+/*jslint evil: true, nomen: true, sloppy: true */
+/*global readFile: true, process: false, Packages: false, print: false,
+console: false, java: false, module: false, requirejsVars, navigator,
+document, importScripts, self, location, Components, FileUtils */
+
+var requirejs, require, define, xpcUtil;
+(function (console, args, readFileFunc) {
+ var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
+ nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
+ version = '2.1.15',
+ jsSuffixRegExp = /\.js$/,
+ commandOption = '',
+ useLibLoaded = {},
+ //Used by jslib/rhino/args.js
+ rhinoArgs = args,
+ //Used by jslib/xpconnect/args.js
+ xpconnectArgs = args,
+ readFile = typeof readFileFunc !== 'undefined' ? readFileFunc : null;
+
+ function showHelp() {
+ console.log('See https://github.com/jrburke/r.js for usage.');
+ }
+
+ if ((typeof navigator !== 'undefined' && typeof document !== 'undefined') ||
+ (typeof importScripts !== 'undefined' && typeof self !== 'undefined')) {
+ env = 'browser';
+
+ readFile = function (path) {
+ return fs.readFileSync(path, 'utf8');
+ };
+
+ exec = function (string) {
+ return eval(string);
+ };
+
+ exists = function () {
+ console.log('x.js exists not applicable in browser env');
+ return false;
+ };
+
+ } else if (typeof process !== 'undefined' && process.versions && !!process.versions.node) {
+ env = 'node';
+
+ //Get the fs module via Node's require before it
+ //gets replaced. Used in require/node.js
+ fs = require('fs');
+ vm = require('vm');
+ path = require('path');
+ //In Node 0.7+ existsSync is on fs.
+ existsForNode = fs.existsSync || path.existsSync;
+
+ nodeRequire = require;
+ nodeDefine = define;
+ reqMain = require.main;
+
+ //Temporarily hide require and define to allow require.js to define
+ //them.
+ require = undefined;
+ define = undefined;
+
+ readFile = function (path) {
+ return fs.readFileSync(path, 'utf8');
+ };
+
+ exec = function (string, name) {
+ return vm.runInThisContext(this.requirejsVars.require.makeNodeWrapper(string),
+ name ? fs.realpathSync(name) : '');
+ };
+
+ exists = function (fileName) {
+ return existsForNode(fileName);
+ };
+
+
+ fileName = process.argv[2];
+
+ if (fileName && fileName.indexOf('-') === 0) {
+ commandOption = fileName.substring(1);
+ fileName = process.argv[3];
+ }
+ } else if (typeof Packages !== 'undefined') {
+ env = 'rhino';
+
+ fileName = args[0];
+
+ if (fileName && fileName.indexOf('-') === 0) {
+ commandOption = fileName.substring(1);
+ fileName = args[1];
+ }
+
+ //Set up execution context.
+ rhinoContext = Packages.org.mozilla.javascript.ContextFactory.getGlobal().enterContext();
+
+ exec = function (string, name) {
+ return rhinoContext.evaluateString(this, string, name, 0, null);
+ };
+
+ exists = function (fileName) {
+ return (new java.io.File(fileName)).exists();
+ };
+
+ //Define a console.log for easier logging. Don't
+ //get fancy though.
+ if (typeof console === 'undefined') {
+ console = {
+ log: function () {
+ print.apply(undefined, arguments);
+ }
+ };
+ }
+ } else if (typeof Components !== 'undefined' && Components.classes && Components.interfaces) {
+ env = 'xpconnect';
+
+ Components.utils['import']('resource://gre/modules/FileUtils.jsm');
+ Cc = Components.classes;
+ Ci = Components.interfaces;
+
+ fileName = args[0];
+
+ if (fileName && fileName.indexOf('-') === 0) {
+ commandOption = fileName.substring(1);
+ fileName = args[1];
+ }
+
+ xpcUtil = {
+ isWindows: ('@mozilla.org/windows-registry-key;1' in Cc),
+ cwd: function () {
+ return FileUtils.getFile("CurWorkD", []).path;
+ },
+
+ //Remove . and .. from paths, normalize on front slashes
+ normalize: function (path) {
+ //There has to be an easier way to do this.
+ var i, part, ary,
+ firstChar = path.charAt(0);
+
+ if (firstChar !== '/' &&
+ firstChar !== '\\' &&
+ path.indexOf(':') === -1) {
+ //A relative path. Use the current working directory.
+ path = xpcUtil.cwd() + '/' + path;
+ }
+
+ ary = path.replace(/\\/g, '/').split('/');
+
+ for (i = 0; i < ary.length; i += 1) {
+ part = ary[i];
+ if (part === '.') {
+ ary.splice(i, 1);
+ i -= 1;
+ } else if (part === '..') {
+ ary.splice(i - 1, 2);
+ i -= 2;
+ }
+ }
+ return ary.join('/');
+ },
+
+ xpfile: function (path) {
+ var fullPath;
+ try {
+ fullPath = xpcUtil.normalize(path);
+ if (xpcUtil.isWindows) {
+ fullPath = fullPath.replace(/\//g, '\\');
+ }
+ return new FileUtils.File(fullPath);
+ } catch (e) {
+ throw new Error((fullPath || path) + ' failed: ' + e);
+ }
+ },
+
+ readFile: function (/*String*/path, /*String?*/encoding) {
+ //A file read function that can deal with BOMs
+ encoding = encoding || "utf-8";
+
+ var inStream, convertStream,
+ readData = {},
+ fileObj = xpcUtil.xpfile(path);
+
+ //XPCOM, you so crazy
+ try {
+ inStream = Cc['@mozilla.org/network/file-input-stream;1']
+ .createInstance(Ci.nsIFileInputStream);
+ inStream.init(fileObj, 1, 0, false);
+
+ convertStream = Cc['@mozilla.org/intl/converter-input-stream;1']
+ .createInstance(Ci.nsIConverterInputStream);
+ convertStream.init(inStream, encoding, inStream.available(),
+ Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
+
+ convertStream.readString(inStream.available(), readData);
+ return readData.value;
+ } catch (e) {
+ throw new Error((fileObj && fileObj.path || '') + ': ' + e);
+ } finally {
+ if (convertStream) {
+ convertStream.close();
+ }
+ if (inStream) {
+ inStream.close();
+ }
+ }
+ }
+ };
+
+ readFile = xpcUtil.readFile;
+
+ exec = function (string) {
+ return eval(string);
+ };
+
+ exists = function (fileName) {
+ return xpcUtil.xpfile(fileName).exists();
+ };
+
+ //Define a console.log for easier logging. Don't
+ //get fancy though.
+ if (typeof console === 'undefined') {
+ console = {
+ log: function () {
+ print.apply(undefined, arguments);
+ }
+ };
+ }
+ }
+
+ /** vim: et:ts=4:sw=4:sts=4
+ * @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/requirejs for details
+ */
+//Not using strict: uneven strict support in browsers, #392, and causes
+//problems with requirejs.exec()/transpiler plugins that may not be strict.
+/*jslint regexp: true, nomen: true, sloppy: true */
+/*global window, navigator, document, importScripts, setTimeout, opera */
+
+
+(function (global) {
+ var req, s, head, baseElement, dataMain, src,
+ interactiveScript, currentlyAddingScript, mainScript, subPath,
+ version = '2.1.15',
+ commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
+ cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
+ jsSuffixRegExp = /\.js$/,
+ currDirRegExp = /^\.\//,
+ op = Object.prototype,
+ ostring = op.toString,
+ hasOwn = op.hasOwnProperty,
+ ap = Array.prototype,
+ apsp = ap.splice,
+ isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document),
+ isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
+ //PS3 indicates loaded and complete, but need to wait for complete
+ //specifically. Sequence is 'loading', 'loaded', execution,
+ // then 'complete'. The UA check is unfortunate, but not sure how
+ //to feature test w/o causing perf issues.
+ readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ?
+ /^complete$/ : /^(complete|loaded)$/,
+ defContextName = '_',
+ //Oh the tragedy, detecting opera. See the usage of isOpera for reason.
+ isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]',
+ contexts = {},
+ cfg = {},
+ globalDefQueue = [],
+ useInteractive = false;
+
+ function isFunction(it) {
+ return ostring.call(it) === '[object Function]';
+ }
+
+ function isArray(it) {
+ return ostring.call(it) === '[object Array]';
+ }
+
+ /**
+ * Helper function for iterating over an array. If the func returns
+ * a true value, it will break out of the loop.
+ */
+ function each(ary, func) {
+ if (ary) {
+ var i;
+ for (i = 0; i < ary.length; i += 1) {
+ if (ary[i] && func(ary[i], i, ary)) {
+ break;
+ }
+ }
+ }
+ }
+
+ /**
+ * Helper function for iterating over an array backwards. If the func
+ * returns a true value, it will break out of the loop.
+ */
+ function eachReverse(ary, func) {
+ if (ary) {
+ var i;
+ for (i = ary.length - 1; i > -1; i -= 1) {
+ if (ary[i] && func(ary[i], i, ary)) {
+ break;
+ }
+ }
+ }
+ }
+
+ function hasProp(obj, prop) {
+ return hasOwn.call(obj, prop);
+ }
+
+ function getOwn(obj, prop) {
+ return hasProp(obj, prop) && obj[prop];
+ }
+
+ /**
+ * Cycles over properties in an object and calls a function for each
+ * property value. If the function returns a truthy value, then the
+ * iteration is stopped.
+ */
+ function eachProp(obj, func) {
+ var prop;
+ for (prop in obj) {
+ if (hasProp(obj, prop)) {
+ if (func(obj[prop], prop)) {
+ break;
+ }
+ }
+ }
+ }
+
+ /**
+ * Simple function to mix in properties from source into target,
+ * but only if target does not already have a property of the same name.
+ */
+ function mixin(target, source, force, deepStringMixin) {
+ if (source) {
+ eachProp(source, function (value, prop) {
+ if (force || !hasProp(target, prop)) {
+ if (deepStringMixin && typeof value === 'object' && value &&
+ !isArray(value) && !isFunction(value) &&
+ !(value instanceof RegExp)) {
+
+ if (!target[prop]) {
+ target[prop] = {};
+ }
+ mixin(target[prop], value, force, deepStringMixin);
+ } else {
+ target[prop] = value;
+ }
+ }
+ });
+ }
+ return target;
+ }
+
+ //Similar to Function.prototype.bind, but the 'this' object is specified
+ //first, since it is easier to read/figure out what 'this' will be.
+ function bind(obj, fn) {
+ return function () {
+ return fn.apply(obj, arguments);
+ };
+ }
+
+ function scripts() {
+ return document.getElementsByTagName('script');
+ }
+
+ function defaultOnError(err) {
+ throw err;
+ }
+
+ //Allow getting a global that is expressed in
+ //dot notation, like 'a.b.c'.
+ function getGlobal(value) {
+ if (!value) {
+ return value;
+ }
+ var g = global;
+ each(value.split('.'), function (part) {
+ g = g[part];
+ });
+ return g;
+ }
+
+ /**
+ * Constructs an error with a pointer to an URL with more information.
+ * @param {String} id the error ID that maps to an ID on a web page.
+ * @param {String} message human readable error.
+ * @param {Error} [err] the original error, if there is one.
+ *
+ * @returns {Error}
+ */
+ function makeError(id, msg, err, requireModules) {
+ var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
+ e.requireType = id;
+ e.requireModules = requireModules;
+ if (err) {
+ e.originalError = err;
+ }
+ return e;
+ }
+
+ if (typeof define !== 'undefined') {
+ //If a define is already in play via another AMD loader,
+ //do not overwrite.
+ return;
+ }
+
+ if (typeof requirejs !== 'undefined') {
+ if (isFunction(requirejs)) {
+ //Do not overwrite an existing requirejs instance.
+ return;
+ }
+ cfg = requirejs;
+ requirejs = undefined;
+ }
+
+ //Allow for a require config object
+ if (typeof require !== 'undefined' && !isFunction(require)) {
+ //assume it is a config object.
+ cfg = require;
+ require = undefined;
+ }
+
+ function newContext(contextName) {
+ var inCheckLoaded, Module, context, handlers,
+ checkLoadedTimeoutId,
+ config = {
+ //Defaults. Do not set a default for map
+ //config to speed up normalize(), which
+ //will run faster if there is no default.
+ waitSeconds: 7,
+ baseUrl: './',
+ paths: {},
+ bundles: {},
+ pkgs: {},
+ shim: {},
+ config: {}
+ },
+ registry = {},
+ //registry of just enabled modules, to speed
+ //cycle breaking code when lots of modules
+ //are registered, but not activated.
+ enabledRegistry = {},
+ undefEvents = {},
+ defQueue = [],
+ defined = {},
+ urlFetched = {},
+ bundlesMap = {},
+ requireCounter = 1,
+ unnormalizedCounter = 1;
+
+ /**
+ * Trims the . and .. from an array of path segments.
+ * It will keep a leading path segment if a .. will become
+ * the first path segment, to help with module name lookups,
+ * which act like paths, but can be remapped. But the end result,
+ * all paths that use this function should look normalized.
+ * NOTE: this method MODIFIES the input array.
+ * @param {Array} ary the array of path segments.
+ */
+ function trimDots(ary) {
+ var i, part;
+ for (i = 0; i < ary.length; i++) {
+ part = ary[i];
+ if (part === '.') {
+ ary.splice(i, 1);
+ i -= 1;
+ } else if (part === '..') {
+ // If at the start, or previous value is still ..,
+ // keep them so that when converted to a path it may
+ // still work when converted to a path, even though
+ // as an ID it is less than ideal. In larger point
+ // releases, may be better to just kick out an error.
+ if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') {
+ continue;
+ } else if (i > 0) {
+ ary.splice(i - 1, 2);
+ i -= 2;
+ }
+ }
+ }
+ }
+
+ /**
+ * Given a relative module name, like ./something, normalize it to
+ * a real name that can be mapped to a path.
+ * @param {String} name the relative name
+ * @param {String} baseName a real name that the name arg is relative
+ * to.
+ * @param {Boolean} applyMap apply the map config to the value. Should
+ * only be done if this normalization is for a dependency ID.
+ * @returns {String} normalized name
+ */
+ function normalize(name, baseName, applyMap) {
+ var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex,
+ foundMap, foundI, foundStarMap, starI, normalizedBaseParts,
+ baseParts = (baseName && baseName.split(...
[truncated message content] |
|
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.
|
|
From: <ma...@us...> - 2014-11-09 17:27:51
|
Revision: 2260
http://sourceforge.net/p/openautomation/code/2260
Author: mayerch
Date: 2014-11-09 17:27:48 +0000 (Sun, 09 Nov 2014)
Log Message:
-----------
Fix paths
Modified Paths:
--------------
CometVisu/_support/make_release.sh
CometVisu/trunk/build.js
Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh 2014-11-09 17:16:14 UTC (rev 2259)
+++ CometVisu/_support/make_release.sh 2014-11-09 17:27:48 UTC (rev 2260)
@@ -38,8 +38,8 @@
rm -rf /tmp/branches
fi
mkdir /tmp/branches
- mkdir /tmp/branches/_support
- cp ../_support/* /tmp/branches/_support
+ mkdir /tmp/_support
+ cp ../_support/* /tmp/_support
cp -r ../trunk /tmp/branches/$RELEASE_DIR
cd /tmp/branches
fi
@@ -59,7 +59,7 @@
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
+$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/" \
Modified: CometVisu/trunk/build.js
===================================================================
--- CometVisu/trunk/build.js 2014-11-09 17:16:14 UTC (rev 2259)
+++ CometVisu/trunk/build.js 2014-11-09 17:27:48 UTC (rev 2260)
@@ -8,8 +8,8 @@
// config options to handle required CSS files:
separateCSS: true,
paths: {
- 'css-builder': '../../_support/css-builder',
- 'normalize': '../../_support/normalize'
+ 'css-builder': '../../../_support/css-builder',
+ 'normalize': '../../../_support/normalize'
},
modules: [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2014-11-30 21:39:03
|
Revision: 2279
http://sourceforge.net/p/openautomation/code/2279
Author: mayerch
Date: 2014-11-30 21:38:55 +0000 (Sun, 30 Nov 2014)
Log Message:
-----------
Verbesserungen im Build System um z.B. Plugins mit CSS Dateien wieder funktionieren zu lassen...
Modified Paths:
--------------
CometVisu/_support/make_release.sh
CometVisu/trunk/build.js
Modified: CometVisu/_support/make_release.sh
===================================================================
--- CometVisu/_support/make_release.sh 2014-11-30 20:37:13 UTC (rev 2278)
+++ CometVisu/_support/make_release.sh 2014-11-30 21:38:55 UTC (rev 2279)
@@ -52,7 +52,7 @@
cd $RELEASE_DIR
#make
-JS_ENGINE=`which node nodejs 2>/dev/null`
+JS_ENGINE=`which node nodejs 2>/dev/null | head -n 1`
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')
@@ -64,6 +64,7 @@
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
+rm release/build.txt
chmod -R a+w src/config
chmod -R a+w release/config
@@ -76,5 +77,5 @@
$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
+tar -cjp --exclude-vcs -f CometVisu_$VERSION.tar.bz2 $RELEASE_DIR
Modified: CometVisu/trunk/build.js
===================================================================
--- CometVisu/trunk/build.js 2014-11-30 20:37:13 UTC (rev 2278)
+++ CometVisu/trunk/build.js 2014-11-30 21:38:55 UTC (rev 2279)
@@ -4,9 +4,11 @@
appDir: 'src/', // relative to baseUrl
dir: 'release/',
mainConfigFile: 'src/lib/templateengine.js',
+ //optimize: 'none', // don't minimize when set
// config options to handle required CSS files:
separateCSS: true,
+ buildCSS: false,
paths: {
'css-builder': '../../../_support/css-builder',
'normalize': '../../../_support/normalize'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X