Permalink
Browse files

use git submodule feature for all external repos

  • Loading branch information...
1 parent 6497c14 commit 17309cf82d7a83cee924db354a05c7f4208ecd48 @SethTisue SethTisue committed Jan 19, 2012
Showing with 57 additions and 59 deletions.
  1. +0 −6 .gitignore
  2. +42 −0 .gitmodules
  3. +1 −47 Makefile
  4. +1 −0 Mathematica-Link
  5. +0 −6 bin/release.sh
  6. +1 −0 extensions/array
  7. +1 −0 extensions/bitmap
  8. +1 −0 extensions/gis
  9. +1 −0 extensions/gogo
  10. +1 −0 extensions/matrix
  11. +1 −0 extensions/network
  12. +1 −0 extensions/profiler
  13. +1 −0 extensions/qtj
  14. +1 −0 extensions/sample
  15. +1 −0 extensions/sample-scala
  16. +1 −0 extensions/sound
  17. +1 −0 extensions/table
  18. +1 −0 models
View
@@ -21,12 +21,6 @@ tmp/
!/dist/java5/java6.jar
!/dist/java5/ui.jar
-# subprojects from separate repos
-/Mathematica-Link/
-/extensions/
-/plugins/
-/models/
-
# autogenerated sources
/src/main/org/nlogo/agent/ImportLexer.java
/src/main/org/nlogo/app/Events.java
View
@@ -0,0 +1,42 @@
+[submodule "models"]
+ path = models
+ url = git://git.assembla.com/models.git
+[submodule "extensions/array"]
+ path = extensions/array
+ url = http://github.com/NetLogo/Array-Extension.git
+[submodule "extensions/bitmap"]
+ path = extensions/bitmap
+ url = http://github.com/NetLogo/Bitmap-Extension.git
+[submodule "extensions/gis"]
+ path = extensions/gis
+ url = http://github.com/NetLogo/GIS-Extension.git
+[submodule "extensions/gogo"]
+ path = extensions/gogo
+ url = http://github.com/NetLogo/GoGo-Extension.git
+[submodule "extensions/matrix"]
+ path = extensions/matrix
+ url = http://github.com/NetLogo/Matrix-Extension.git
+[submodule "extensions/network"]
+ path = extensions/network
+ url = http://github.com/NetLogo/Network-Extension.git
+[submodule "extensions/profiler"]
+ path = extensions/profiler
+ url = http://github.com/NetLogo/Profiler-Extension.git
+[submodule "extensions/qtj"]
+ path = extensions/qtj
+ url = http://github.com/NetLogo/QTJ-Extension.git
+[submodule "extensions/sample"]
+ path = extensions/sample
+ url = http://github.com/NetLogo/Sample-Extension.git
+[submodule "extensions/sample-scala"]
+ path = extensions/sample-scala
+ url = http://github.com/NetLogo/Sample-Scala-Extension.git
+[submodule "extensions/sound"]
+ path = extensions/sound
+ url = http://github.com/NetLogo/Sound-Extension.git
+[submodule "extensions/table"]
+ path = extensions/table
+ url = http://github.com/NetLogo/Table-Extension.git
+[submodule "Mathematica-Link"]
+ path = Mathematica-Link
+ url = git@github.com:NetLogo/Mathematica-Link.git
View
@@ -87,56 +87,10 @@ extensions: $(EXTENSIONS)
# most of them use NetLogoLite.jar, but the profiler extension uses NetLogo.jar - ST 5/11/11
$(EXTENSIONS): | NetLogo.jar NetLogoLite.jar
- mkdir -p models
- if [ ! -d models/test ] ; then git clone git://git.assembla.com/models.git ; fi
- mkdir -p extensions
- if [ ! -d extensions/array/src ] ; then git clone http://github.com/NetLogo/Array-Extension.git extensions/array ; fi
- if [ ! -d extensions/bitmap/src ] ; then git clone http://github.com/NetLogo/Bitmap-Extension.git extensions/bitmap ; fi
- if [ ! -d extensions/gis/src ] ; then git clone http://github.com/NetLogo/GIS-Extension.git extensions/gis ; fi
- if [ ! -d extensions/gogo/src ] ; then git clone http://github.com/NetLogo/GoGo-Extension.git extensions/gogo ; fi
- if [ ! -d extensions/matrix/src ] ; then git clone http://github.com/NetLogo/Matrix-Extension.git extensions/matrix ; fi
- if [ ! -d extensions/network/src ] ; then git clone http://github.com/NetLogo/Network-Extension.git extensions/network ; fi
- if [ ! -d extensions/profiler/src ] ; then git clone http://github.com/NetLogo/Profiler-Extension.git extensions/profiler ; fi
- if [ ! -d extensions/qtj/src ] ; then git clone http://github.com/NetLogo/QTJ-Extension.git extensions/qtj ; fi
- if [ ! -d extensions/sample/src ] ; then git clone http://github.com/NetLogo/Sample-Extension.git extensions/sample ; fi
- if [ ! -d extensions/sample-scala/src ] ; then git clone http://github.com/NetLogo/Sample-Scala-Extension.git extensions/sample-scala ; fi
- if [ ! -d extensions/sound/src ] ; then git clone http://github.com/NetLogo/Sound-Extension.git extensions/sound ; fi
- if [ ! -d extensions/table/src ] ; then git clone http://github.com/NetLogo/Table-Extension.git extensions/table ; fi
+ git submodule update --init
@echo "@@@ building" $(notdir $@)
cd $(dir $@); JAVA_HOME=$(JAVA_HOME) SCALA_JAR=../../$(SCALA_JAR) make -s $(notdir $@)
-# pull down versions core devel has rights to push to - ST 5/12/11
-.PHONY: repos
-repos:
- mkdir -p models
- if [ ! -d models/test ] ; then git clone git@git.assembla.com:models.git ; fi
- cd models; git pull; git status
- mkdir -p extensions
- if [ ! -d extensions/array/src ] ; then git clone git@github.com:/NetLogo/Array-Extension.git extensions/array ; fi
- cd extensions/array; git pull; git status
- if [ ! -d extensions/bitmap/src ] ; then git clone git@github.com:/NetLogo/Bitmap-Extension.git extensions/bitmap ; fi
- cd extensions/bitmap; git pull; git status
- if [ ! -d extensions/gis/src ] ; then git clone git@github.com:/NetLogo/GIS-Extension.git extensions/gis ; fi
- cd extensions/gis; git pull; git status
- if [ ! -d extensions/gogo/src ] ; then git clone git@github.com:/NetLogo/GoGo-Extension.git extensions/gogo ; fi
- cd extensions/gogo; git pull; git status
- if [ ! -d extensions/matrix/src ] ; then git clone git@github.com:/NetLogo/Matrix-Extension.git extensions/matrix ; fi
- cd extensions/matrix; git pull; git status
- if [ ! -d extensions/network/src ] ; then git clone git@github.com:/NetLogo/Network-Extension.git extensions/network ; fi
- cd extensions/network; git pull; git status
- if [ ! -d extensions/profiler/src ] ; then git clone git@github.com:/NetLogo/Profiler-Extension.git extensions/profiler ; fi
- cd extensions/profiler; git pull; git status
- if [ ! -d extensions/qtj/src ] ; then git clone git@github.com:/NetLogo/QTJ-Extension.git extensions/qtj ; fi
- cd extensions/qtj; git pull; git status
- if [ ! -d extensions/sample/src ] ; then git clone git@github.com:/NetLogo/Sample-Extension.git extensions/sample ; fi
- cd extensions/sample; git pull; git status
- if [ ! -d extensions/sample-scala/src ] ; then git clone git@github.com:/NetLogo/Sample-Scala-Extension.git extensions/sample-scala ; fi
- cd extensions/sample-scala; git pull; git status
- if [ ! -d extensions/sound/src ] ; then git clone git@github.com:/NetLogo/Sound-Extension.git extensions/sound ; fi
- cd extensions/sound; git pull; git status
- if [ ! -d extensions/table/src ] ; then git clone git@github.com:/NetLogo/Table-Extension.git extensions/table ; fi
- cd extensions/table; git pull; git status
-
### Scaladoc
# for internal devel team use
Submodule Mathematica-Link added at 8c9010
View
@@ -9,7 +9,6 @@ CHMOD=chmod
CP=cp
DU=du
FIND=find
-GIT=git
GREP=grep
HDIUTIL=hdiutil
IJ=bin/install4jc
@@ -45,11 +44,6 @@ then
exit 1
fi
-# maybe we should be using the "submodules" feature of git for this? - ST 5/7/11
-if [ ! -d "Mathematica-Link" ]; then
- $GIT clone git@github.com:NetLogo/Mathematica-Link.git
-fi
-
if [ ! -f "Mathematica-Link/JLink.jar" ]; then
echo "Mathematica-Link/JLink.jar missing. copy it from a Mathematica installation (or the 4.1 branch, if you're a CCL'er)"
echo "(it's needed to compile the link, but we don't have a license to distribute it)"
Submodule array added at 09248c
Submodule bitmap added at 7376be
Submodule gis added at 57b959
Submodule gogo added at dd8ac7
Submodule matrix added at 9e6ca2
Submodule network added at a56451
Submodule profiler added at e9c2cb
Submodule qtj added at 108b46
Submodule sample added at af24eb
Submodule sample-scala added at c7d4aa
Submodule sound added at 2cafe9
Submodule table added at 74636e
1 models
Submodule models added at 20e693

0 comments on commit 17309cf

Please sign in to comment.