From 9a06bf47b96a393a95b3a5348368a79f9570121f Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 10 Jul 2008 00:05:21 +0000
Subject: added convenience makefile and nant-color script.  I've had these on
 my laptop forever, and others might find them useful to be part of the main
 tree.

---
 Makefile | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 Makefile

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..b863345
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+all:
+	export PATH=/usr/local/bin:$(PATH)
+	./runprebuild.sh
+	./nant-color
+	find OpenSim -name \*.mdb -exec cp {} bin \; 
+
+clean:
+	export PATH=/usr/local/bin:$(PATH)
+	./nant-color clean
+
+tags:
+	find OpenSim -name \*\.cs | xargs etags 
-- 
cgit v1.1


From 60ed8c38220f665aed52fdeca72428211d4d6d66 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 25 Jul 2008 12:51:01 +0000
Subject: enhancing Makefile to avoid colorification when running inside
 emacs...

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b863345..af504ac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
+NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
+
 all:
-	export PATH=/usr/local/bin:$(PATH)
+	@export PATH=/usr/local/bin:$(PATH)
 	./runprebuild.sh
-	./nant-color
+	${NANT}
 	find OpenSim -name \*.mdb -exec cp {} bin \; 
 
 clean:
-	export PATH=/usr/local/bin:$(PATH)
-	./nant-color clean
+	@export PATH=/usr/local/bin:$(PATH)
+	${NANT} clean
 
 tags:
 	find OpenSim -name \*\.cs | xargs etags 
+
-- 
cgit v1.1


From ce0a8d7beffccbaeb6b603a96b7729278c4c9e75 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 8 Sep 2008 20:34:45 +0000
Subject: changes to Test directory structure per opensim-dev conversation

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index af504ac..a1858b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,18 @@
 NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
 
 all:
-	@export PATH=/usr/local/bin:$(PATH)
+	# @export PATH=/usr/local/bin:$(PATH)
 	./runprebuild.sh
 	${NANT}
 	find OpenSim -name \*.mdb -exec cp {} bin \; 
 
 clean:
-	@export PATH=/usr/local/bin:$(PATH)
+	# @export PATH=/usr/local/bin:$(PATH)
 	${NANT} clean
 
+test:
+	${NANT} test
+
 tags:
 	find OpenSim -name \*\.cs | xargs etags 
 
-- 
cgit v1.1


From 1799913593f74b113322118106e8ca221310ba69 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 10 Sep 2008 17:49:37 +0000
Subject: add shell for SQLite testing.  No tests yet. add another nant target
 for test-xml to get the verbose version

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a1858b7..d5c7146 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ clean:
 test:
 	${NANT} test
 
+test-xml:
+	${NANT} test-xml
+
 tags:
 	find OpenSim -name \*\.cs | xargs etags 
 
-- 
cgit v1.1


From b7dde334787f9a3267aab81c19cddd32df9ccc19 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 10 Sep 2008 20:31:24 +0000
Subject: have the Makefile run prebuild on test targets as well as it helps to
 actually include new test files to run prior to upload.

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d5c7146..106e866 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
 NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
 
-all:
-	# @export PATH=/usr/local/bin:$(PATH)
+prebuild:
 	./runprebuild.sh
+
+all: prebuild
+	# @export PATH=/usr/local/bin:$(PATH)
 	${NANT}
 	find OpenSim -name \*.mdb -exec cp {} bin \; 
 
@@ -10,10 +12,10 @@ clean:
 	# @export PATH=/usr/local/bin:$(PATH)
 	${NANT} clean
 
-test:
+test: prebuild
 	${NANT} test
 
-test-xml:
+test-xml: prebuild
 	${NANT} test-xml
 
 tags:
-- 
cgit v1.1


From a8f18bda13bf142b3630307fa407d26c4d4296fa Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 10 Sep 2008 21:36:01 +0000
Subject: make default rule 'all' again

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 106e866..a9c2a86 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
 
-prebuild:
-	./runprebuild.sh
-
 all: prebuild
 	# @export PATH=/usr/local/bin:$(PATH)
 	${NANT}
 	find OpenSim -name \*.mdb -exec cp {} bin \; 
 
+prebuild:
+	./runprebuild.sh
+
 clean:
 	# @export PATH=/usr/local/bin:$(PATH)
 	${NANT} clean
-- 
cgit v1.1


From faa9873dc66bbfc74f351749680c0f62fa8d7f38 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Sat, 7 Feb 2009 03:18:58 +0000
Subject: create a "make release" target which does the release instead of
 debug build.  Just a convenience for people on the Linux side of the house

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a9c2a86..e7cede2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,10 @@ all: prebuild
 	${NANT}
 	find OpenSim -name \*.mdb -exec cp {} bin \; 
 
+release: prebuild
+        ${NANT} -D:project.config=Release
+        find OpenSim -name \*.mdb -exec cp {} bin \;
+
 prebuild:
 	./runprebuild.sh
 
-- 
cgit v1.1


From de42d8551828022a7879ef8a42e519e23443d5ed Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Sat, 7 Feb 2009 03:21:34 +0000
Subject: oops spaces where tabs should be in the makefile

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e7cede2..6049b8f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ all: prebuild
 	find OpenSim -name \*.mdb -exec cp {} bin \; 
 
 release: prebuild
-        ${NANT} -D:project.config=Release
-        find OpenSim -name \*.mdb -exec cp {} bin \;
+	${NANT} -D:project.config=Release
+	find OpenSim -name \*.mdb -exec cp {} bin \;
 
 prebuild:
 	./runprebuild.sh
-- 
cgit v1.1


From f90c203b7d49b38964cabf18b1efc0ab18ae4b3c Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Mon, 6 Apr 2009 16:28:04 +0000
Subject: including Makefile.local iff it exists

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6049b8f..1bc1005 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
 
+include $(wildcard Makefile.local)
+
 all: prebuild
 	# @export PATH=/usr/local/bin:$(PATH)
 	${NANT}
-- 
cgit v1.1


From 96259e82f6317994a7a0e4a25d1f70961b9065c1 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Thu, 16 Apr 2009 12:07:40 +0000
Subject: move inclusion of Makefile.local to the end to avoid surprising
 results

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1bc1005..8924d34 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
 
-include $(wildcard Makefile.local)
-
 all: prebuild
 	# @export PATH=/usr/local/bin:$(PATH)
 	${NANT}
@@ -27,3 +25,5 @@ test-xml: prebuild
 tags:
 	find OpenSim -name \*\.cs | xargs etags 
 
+include $(wildcard Makefile.local)
+
-- 
cgit v1.1


From 39b30accd206f3d4b6936fa79f7a43db134374e4 Mon Sep 17 00:00:00 2001
From: Johan Berntsson
Date: Mon, 1 Jun 2009 01:24:18 +0000
Subject: Added cscope tag support in Makefile

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8924d34..066eba6 100644
--- a/Makefile
+++ b/Makefile
@@ -25,5 +25,9 @@ test-xml: prebuild
 tags:
 	find OpenSim -name \*\.cs | xargs etags 
 
+cscope-tags:
+	find OpenSim -name \*\.cs -fprint cscope.files
+	cscope -b
+
 include $(wildcard Makefile.local)
 
-- 
cgit v1.1


From 2c2406346ebfb4d7853df03798b7de8fecb72775 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Tue, 4 Aug 2009 15:55:48 -0400
Subject: minor format change

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 066eba6..46ddc2f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
+NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
 
 all: prebuild
 	# @export PATH=/usr/local/bin:$(PATH)
-- 
cgit v1.1


From 01242c5ccb5abe2cf0b1ad7ad619d606827bd4bb Mon Sep 17 00:00:00 2001
From: dr scofield (aka dirk husemann)
Date: Thu, 3 Sep 2009 18:31:02 +0200
Subject: making Makefile a bit more robust: can now cope with missing ruby in
 a better way.

---
 Makefile | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 46ddc2f..493cdca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,14 @@
-NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
+# hey, emacs! this is a -*- makefile -*-
+#
+# OpenSim makefile
+#
+
+RUBY    = $(strip $(shell which ruby 2>/dev/null))
+ifeq ($(RUBY),)
+NANT    = nant
+else
+NANT	= $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
+endif
 
 all: prebuild
 	# @export PATH=/usr/local/bin:$(PATH)
@@ -14,7 +24,7 @@ prebuild:
 
 clean:
 	# @export PATH=/usr/local/bin:$(PATH)
-	${NANT} clean
+	-${NANT} clean
 
 test: prebuild
 	${NANT} test
-- 
cgit v1.1