Author: jm
Date: 2011-06-15 21:20:56 -0700 (Wed, 15 Jun 2011)
New Revision: 25778
Added:
csplugins/trunk/toronto/jm/paperwing-build/bootstrap.sh
csplugins/trunk/toronto/jm/paperwing-build/build.sh
csplugins/trunk/toronto/jm/paperwing-build/jogl.config
csplugins/trunk/toronto/jm/paperwing-build/jogl.files
csplugins/trunk/toronto/jm/paperwing-build/patches/
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
csplugins/trunk/toronto/jm/paperwing-build/start.sh
Log:
Added build/deploy scripts for Yue's 3D rendering engine bundle
Added: csplugins/trunk/toronto/jm/paperwing-build/bootstrap.sh
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/bootstrap.sh
(rev 0)
+++ csplugins/trunk/toronto/jm/paperwing-build/bootstrap.sh 2011-06-16
04:20:56 UTC (rev 25778)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+function abspath {
+ python -c 'import os, sys; print os.path.realpath(sys.argv[1])' "$1"
+}
+
+TEMP_DIR=$(abspath temp)
+JAR_DIR=$(abspath jar)
+FILES_FILE=$(abspath jogl.files)
+
+source jogl.config
+
+mkdir -p "${TEMP_DIR}"
+mkdir -p "${JAR_DIR}"
+
+# Download JOGL
+pushd "${TEMP_DIR}"
+for FILE in $(cat "${FILES_FILE}")
+do
+ URL=${JOGL_BASE_URL}/jogl-${JOGL_VERSION}-${FILE}
+ curl -O "${URL}"
+done
+
+for FILE in *.7z
+do
+ 7z x "${FILE}"
+done
+mv */jar/*.jar "${JAR_DIR}"
+popd
+
+# Check out repacker
+svn co http://chianti.ucsd.edu/svn/csplugins/trunk/toronto/jm/repacker/
+
+# Repackage JOGL
+pushd repacker
+ ./repack.sh jogl "${JAR_DIR}"/*.jar
+ ./deploy.sh cytoscape-temp ${JOGL_VERSION}
+popd
+
+# Check out bundles that need to be patched
+for BUNDLE in gui-distribution swing-application-impl vizmap-gui-impl
+do
+ svn co http://chianti.ucsd.edu/svn/core3/${BUNDLE}/trunk ${BUNDLE}
+done
+
+# Check out paperwing-impl
+svn co
http://chianti.ucsd.edu/svn/csplugins/trunk/toronto/yuedong/paperwing-impl
Property changes on: csplugins/trunk/toronto/jm/paperwing-build/bootstrap.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: csplugins/trunk/toronto/jm/paperwing-build/build.sh
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/build.sh
(rev 0)
+++ csplugins/trunk/toronto/jm/paperwing-build/build.sh 2011-06-16 04:20:56 UTC
(rev 25778)
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+function abspath {
+ python -c 'import os, sys; print os.path.realpath(sys.argv[1])' "$1"
+}
+
+function apply_patches {
+ for PATCH in $1/*.patch
+ do
+ patch -r ignore.rej -p0 -N < ${PATCH}
+ rm ignore.rej
+ done
+}
+
+DIST_DIR=$(abspath dist)
+PATCH_DIR=$(abspath patches)
+
+rm -rf ${DIST_DIR}
+mkdir -p ${DIST_DIR}
+
+# Build main bundle
+pushd paperwing-impl
+apply_patches "${PATCH_DIR}/paperwing-impl"
+mvn clean install
+cp target/paperwing-impl-*.jar ${DIST_DIR}
+popd
+
+# Copy over non-core dependencies
+cp repacker/bundles/*.jar ${DIST_DIR}
+
+# Patch core so it doesn't look for ding
+for BUNDLE in swing-application-impl vizmap-gui-impl
+do
+ pushd ${BUNDLE}
+ sed -i '' -E 's/filter="\(id=ding[^)]*\)"//'
src/main/resources/META-INF/spring/bundle-context-osgi*.xml
+
+ apply_patches "${PATCH_DIR}/${BUNDLE}"
+ mvn clean install
+ popd
+done
+
+# Patch gui-distribution with our boot delegation options
+pushd gui-distribution
+grep bootdelegation distribution/src/main/bin/cytoscape.sh || sed -i '' -E
's/cytoscape-launcher.jar/-Dorg.osgi.framework.bootdelegation=sun.*,com.sun.*,apple.*
cytoscape-launcher.jar/' distribution/src/main/bin/cytoscape.sh
+mvn clean install
+
+pushd distribution/target/cytoscape-*/cytoscape-*/
+
+# Copy over our bundles
+cp ${DIST_DIR}/*.jar bundles/plugins
+
+# Remove ding bundles
+rm bundles/startlevel-3/ding-*
+popd
+
+popd
Property changes on: csplugins/trunk/toronto/jm/paperwing-build/build.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: csplugins/trunk/toronto/jm/paperwing-build/jogl.config
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/jogl.config
(rev 0)
+++ csplugins/trunk/toronto/jm/paperwing-build/jogl.config 2011-06-16
04:20:56 UTC (rev 25778)
@@ -0,0 +1,2 @@
+JOGL_VERSION=2.0-b23-20110303
+JOGL_BASE_URL=https://jogamp.org/deployment/autobuilds/rc/jogl-b23-2011-03-03_00-54-48/
\ No newline at end of file
Added: csplugins/trunk/toronto/jm/paperwing-build/jogl.files
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/jogl.files
(rev 0)
+++ csplugins/trunk/toronto/jm/paperwing-build/jogl.files 2011-06-16
04:20:56 UTC (rev 25778)
@@ -0,0 +1,5 @@
+linux-amd64.7z
+linux-i586.7z
+macosx-universal.7z
+windows-amd64.7z
+windows-i586.7z
\ No newline at end of file
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
(rev 0)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
2011-06-16 04:20:56 UTC (rev 25778)
@@ -0,0 +1,364 @@
+Index: pom.xml
+===================================================================
+--- pom.xml (revision 25765)
++++ pom.xml (working copy)
+@@ -20,355 +20,24 @@
+ <dependencies>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+- <artifactId>gluegen-gl</artifactId>
++ <artifactId>jogl</artifactId>
+ <version>2.0-b23-20110303</version>
+ </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+-
<artifactId>gluegen-rt-natives-macosx-universal</artifactId>
+- <version>2.0-b20-20110302</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>gluegen-rt</artifactId>
+- <version>2.0-b20-20110302</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl-natives-macosx-universal</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.all-noawt</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.all</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.awt</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.core</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.egl</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.gldesktop</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.gldesktop.dbg</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.gles1</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.gles1.dbg</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.gles2</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.gles2.dbg</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.glu.gldesktop</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.glu.mipmap</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.glu.tess</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.os.osx</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.os.win</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.os.x11</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.sdk</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.test</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.util.awt</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.util</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.util.fixedfuncemu</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jogl.util.gldesktop</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+-
<artifactId>nativewindow-natives-macosx-universal</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>nativewindow.all-noawt</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>nativewindow.all</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>nativewindow.awt</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>nativewindow.core</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>nativewindow.os.win</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>nativewindow.os.x11</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt-natives-macosx-universal</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.all-noawt</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.all</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.awt</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.core</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.event</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.hw.broadcomegl</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.hw.intelgdl</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.ogl</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.os.osx</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>newt.os.win</artifactId>
+- <version>2.0-b23-20110303</version>
+- </dependency>
+
+-
+- <!--
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-animation-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-awt-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-collada-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-core-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-effects-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-extras-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-jogl-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-lwjgl-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-swt-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-terrain-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>ardor3d-ui-0.7</artifactId>
+- <version>0.7</version>
+- </dependency>
+-
+-
+-
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>guava-r09</artifactId>
+- <version>r09</version>
+- </dependency>
+-
+-
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>AppleJavaExtensions</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>jinput</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>lwjgl-debug</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>lwjgl</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>lwjgl_test</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>lwjgl_util</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>lwjgl_util_applet</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- <dependency>
+- <groupId>cytoscape-temp</groupId>
+- <artifactId>lzma</artifactId>
+- <version>2.7.1</version>
+- </dependency>
+- -->
+-
+-
+-
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>model-api</artifactId>
+- <version>3.0.0-alpha3-SNAPSHOT</version>
++ <version>3.0.0-alpha5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>swing-application-api</artifactId>
+- <version>3.0.0-alpha2-SNAPSHOT</version>
++ <version>3.0.0-alpha3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-api</artifactId>
+- <version>3.0.0-alpha4-SNAPSHOT</version>
++ <version>3.0.0-alpha5-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
(rev 0)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/swing-application-impl/NetworkViewManager.java.patch
2011-06-16 04:20:56 UTC (rev 25778)
@@ -0,0 +1,13 @@
+Index: src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
+===================================================================
+--- src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
(revision 25654)
++++ src/main/java/org/cytoscape/internal/view/NetworkViewManager.java
(working copy)
+@@ -184,7 +184,7 @@
+ throw new IllegalArgumentException("Renderer ID is
null.");
+
+ factories.put(rendererID.toString(), factory);
+- if (currentRenderingEngineFactory == null &&
rendererID.equals(DEFAULT_PRESENTATION)) {
++ if (currentRenderingEngineFactory == null) {
+ currentRenderingEngineFactory = factory;
+ logger.info(rendererID + " is registered as the default
rendering engine.");
+ }
Added: csplugins/trunk/toronto/jm/paperwing-build/start.sh
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/start.sh
(rev 0)
+++ csplugins/trunk/toronto/jm/paperwing-build/start.sh 2011-06-16 04:20:56 UTC
(rev 25778)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+pushd gui-distribution/distribution/target/cytoscape-*/cytoscape-*/
+./cytoscape.sh
+popd
Property changes on: csplugins/trunk/toronto/jm/paperwing-build/start.sh
___________________________________________________________________
Added: svn:executable
+ *
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
