Author: jm
Date: 2011-09-20 13:43:15 -0700 (Tue, 20 Sep 2011)
New Revision: 26887
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/bundle-context-osgi.xml.patch
Modified:
csplugins/trunk/toronto/jm/paperwing-build/bootstrap.sh
csplugins/trunk/toronto/jm/paperwing-build/build.sh
csplugins/trunk/toronto/jm/paperwing-build/start.sh
Log:
Updated script so all build artifacts are in build directory
Added patch to use viewmodel-impl's CyNetworkViewFactory since that service is
no longer exported by the core (it's exported by ding now)
Modified: csplugins/trunk/toronto/jm/paperwing-build/bootstrap.sh
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/bootstrap.sh 2011-09-20
18:57:19 UTC (rev 26886)
+++ csplugins/trunk/toronto/jm/paperwing-build/bootstrap.sh 2011-09-20
20:43:15 UTC (rev 26887)
@@ -4,12 +4,14 @@
python -c 'import os, sys; print os.path.realpath(sys.argv[1])' "$1"
}
-TEMP_DIR=$(abspath temp)
-JAR_DIR=$(abspath jar)
+BUILD_DIR=$(abspath build)
+TEMP_DIR=$(abspath build/temp)
+JAR_DIR=$(abspath build/jar)
FILES_FILE=$(abspath jogl.files)
source jogl.config
+mkdir -p "${BUILD_DIR}"
mkdir -p "${TEMP_DIR}"
mkdir -p "${JAR_DIR}"
@@ -28,6 +30,8 @@
mv */jar/*.jar "${JAR_DIR}"
popd
+pushd ${BUILD_DIR}
+
# Check out repacker
svn co http://chianti.ucsd.edu/svn/csplugins/trunk/toronto/jm/repacker/
@@ -40,10 +44,12 @@
# Check out bundles that need to be patched
svn co http://chianti.ucsd.edu/svn/core3/gui-distribution/trunk
gui-distribution
-for BUNDLE in gui-distribution swing-application-impl vizmap-gui-impl
presentation-impl
+for BUNDLE in gui-distribution swing-application-impl vizmap-gui-impl
presentation-impl viewmodel-impl
do
svn co http://chianti.ucsd.edu/svn/core3/impl/trunk/${BUNDLE}
done
# Check out paperwing-impl
svn co
http://chianti.ucsd.edu/svn/csplugins/trunk/toronto/yuedong/paperwing-impl
+
+popd
Modified: csplugins/trunk/toronto/jm/paperwing-build/build.sh
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/build.sh 2011-09-20 18:57:19 UTC
(rev 26886)
+++ csplugins/trunk/toronto/jm/paperwing-build/build.sh 2011-09-20 20:43:15 UTC
(rev 26887)
@@ -12,9 +12,11 @@
done
}
-DIST_DIR=$(abspath dist)
+BUILD_DIR=$(abspath build)
+DIST_DIR=$(abspath build/dist)
PATCH_DIR=$(abspath patches)
+pushd ${BUILD_DIR}
rm -rf ${DIST_DIR}
mkdir -p ${DIST_DIR}
@@ -34,7 +36,7 @@
cp repacker/bundles/*.jar ${DIST_DIR}
# Patch core so it doesn't look for ding
-for BUNDLE in swing-application-impl vizmap-gui-impl presentation-impl
+for BUNDLE in swing-application-impl vizmap-gui-impl presentation-impl
viewmodel-impl
do
pushd ${BUNDLE}
apply_patches "${PATCH_DIR}/${BUNDLE}"
@@ -57,3 +59,4 @@
popd
popd
+popd
\ No newline at end of file
Added:
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/bundle-context-osgi.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/bundle-context-osgi.xml.patch
(rev 0)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/viewmodel-impl/bundle-context-osgi.xml.patch
2011-09-20 20:43:15 UTC (rev 26887)
@@ -0,0 +1,17 @@
+Index: impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
+===================================================================
+--- impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
(revision 26871)
++++ impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
(working copy)
+@@ -11,6 +11,12 @@
+ interface="org.cytoscape.service.util.CyServiceRegistrar" />
+
+ <!-- Export Beans as Services -->
++ <osgi:service id="cyNetworkViewFactoryService"
ref="cyNetworkViewFactory"
++ interface="org.cytoscape.view.model.CyNetworkViewFactory">
++ <osgi:service-properties>
++ <entry key="service.type" value="factory" />
++ </osgi:service-properties>
++ </osgi:service>
+
+ <osgi:service id="cyNetworkViewManagerService"
ref="cyNetworkViewManager"
+ auto-export="interfaces">
Modified: csplugins/trunk/toronto/jm/paperwing-build/start.sh
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/start.sh 2011-09-20 18:57:19 UTC
(rev 26886)
+++ csplugins/trunk/toronto/jm/paperwing-build/start.sh 2011-09-20 20:43:15 UTC
(rev 26887)
@@ -1,5 +1,5 @@
#!/bin/bash
-pushd gui-distribution/distribution/target/cytoscape-*/cytoscape-*/
+pushd build/gui-distribution/distribution/target/cytoscape-*/cytoscape-*/
./cytoscape.sh
popd
--
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.
