Permalink
Browse files

no more submodules - pulling in js dependencies from zip files instead

  • Loading branch information...
1 parent 2fab8ce commit 9f293869b9fb298cf3a16f4e64d1626bfa54ee1f @ahocevar ahocevar committed Aug 12, 2011
Showing with 17 additions and 16 deletions.
  1. +3 −0 .gitignore
  2. +0 −9 .gitmodules
  3. +14 −7 calculator/build.xml
View
@@ -14,4 +14,7 @@ risiko.egg-info/
risiko/development.db
extras/.vagrant
calculator/build/
+calculator/app/static/externals/openlayers
+calculator/app/static/externals/geoext
+calculator/app/static/externals/gxp
impact/static/calculator
View
@@ -1,9 +0,0 @@
-[submodule "calculator/app/static/externals/openlayers"]
- path = calculator/app/static/externals/openlayers
- url = http://github.com/openlayers/openlayers.git
-[submodule "calculator/app/static/externals/geoext"]
- path = calculator/app/static/externals/geoext
- url = http://github.com/opengeo/GeoExt.git
-[submodule "calculator/app/static/externals/gxp"]
- path = calculator/app/static/externals/gxp
- url = http://github.com/opengeo/gxp.git
View
@@ -6,6 +6,7 @@
</description>
<property name="build" location="build"/>
+ <property name="externals" location="app/static/externals/"/>
<property name="app.proxy.geoserver" value="http://localhost:8001/geoserver-geonode-dev"/>
<property name="app.proxy.geonode" value="http://localhost:8000"/>
<property name="app.port" value="8080"/>
@@ -38,15 +39,21 @@
<arg line="checkout 86eacbd7b3bf62b8e99f46911dd5a633464b8570"/>
</exec>
- <echo message="pulling in submodules"/>
- <exec executable="git" dir="../" failonerror="true">
- <arg line="submodule update --init -- calculator/app/static/externals/openlayers"/>
+ <echo message="pulling in js dependencies"/>
+ <get src="https://github.com/openlayers/openlayers/zipball/2.x" dest="${build}/openlayers.zip"/>
+ <unzip src="${build}/openlayers.zip" dest="${externals}"/>
+ <exec executable="sh" dir="${externals}" failonerror="true">
+ <arg line="-c 'rm -Rf openlayers &amp;&amp; mv openlayers-openlayers-* openlayers'"/>
</exec>
- <exec executable="git" dir="../" failonerror="true">
- <arg line="submodule update --init -- calculator/app/static/externals/geoext"/>
+ <get src="https://github.com/opengeo/GeoExt/zipball/master" dest="${build}/geoext.zip"/>
+ <unzip src="${build}/geoext.zip" dest="${externals}"/>
+ <exec executable="sh" dir="${externals}" failonerror="true">
+ <arg line="-c 'rm -Rf geoext &amp;&amp; mv opengeo-GeoExt-* geoext'"/>
</exec>
- <exec executable="git" dir="../" failonerror="true">
- <arg line="submodule update --init -- calculator/app/static/externals/gxp"/>
+ <get src="https://github.com/opengeo/gxp/zipball/master" dest="${build}/gxp.zip"/>
+ <unzip src="${build}/gxp.zip" dest="${externals}"/>
+ <exec executable="sh" dir="${externals}" failonerror="true">
+ <arg line="-c 'rm -Rf gxp &amp;&amp; mv opengeo-gxp-* gxp'"/>
</exec>
</target>

0 comments on commit 9f29386

Please sign in to comment.