Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

use git submodule feature for all external repos

  • Loading branch information...
commit 17309cf82d7a83cee924db354a05c7f4208ecd48 1 parent 6497c14
@SethTisue SethTisue authored
View
6 .gitignore
@@ -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
42 .gitmodules
@@ -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
48 Makefile
@@ -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
1  Mathematica-Link
@@ -0,0 +1 @@
+Subproject commit 8c9010e2b051735ab6412f5e06018a7baf104742
View
6 bin/release.sh
@@ -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)"
1  extensions/array
@@ -0,0 +1 @@
+Subproject commit 09248cabac704790dc6d3dadd8c5ee6ef27430c3
1  extensions/bitmap
@@ -0,0 +1 @@
+Subproject commit 7376bef2a58b6c5778bd42b3a75b74d30a07d42a
1  extensions/gis
@@ -0,0 +1 @@
+Subproject commit 57b9593ce6bcb870c1616f689af36c74d4db0229
1  extensions/gogo
@@ -0,0 +1 @@
+Subproject commit dd8ac751b6e4e2be15c0883674b790831bb88ff9
1  extensions/matrix
@@ -0,0 +1 @@
+Subproject commit 9e6ca28659435ed008f1d430d0d311599aeead99
1  extensions/network
@@ -0,0 +1 @@
+Subproject commit a56451b8109db519b1cfa849feececa3d6fade03
1  extensions/profiler
@@ -0,0 +1 @@
+Subproject commit e9c2cbe51a871dc4b98f593e067558a13116e891
1  extensions/qtj
@@ -0,0 +1 @@
+Subproject commit 108b46c6b71d78a0c08de573d3fab48d8d261297
1  extensions/sample
@@ -0,0 +1 @@
+Subproject commit af24eb7eca4245d7ff2de4bed466b1dce22ba6de
1  extensions/sample-scala
@@ -0,0 +1 @@
+Subproject commit c7d4aa8c99b67bcdd7053aaaf8a9ea85c51042cb
1  extensions/sound
@@ -0,0 +1 @@
+Subproject commit 2cafe942ac2cc073a25f40868acb0dbf912de3e9
1  extensions/table
@@ -0,0 +1 @@
+Subproject commit 74636ed11f775c81e0ce3895d249c9148f6b1bd0
1  models
@@ -0,0 +1 @@
+Subproject commit 20e693e358d64d2e18b35feb60b18137ef127a77
Please sign in to comment.
Something went wrong with that request. Please try again.