Merged changes in Prebuild trunk up to r258 into OpenSim's Prebuild.

Hopefully this should make merging upstream easier.
Building with NAnt should still work, but Visual Studio is untested.

6 files changed, 28 insertions, 1 deletions

diff --git a/Prebuild/scripts/Clean.sh b/Prebuild/scripts/Clean.sh
new file mode 100755
index 0000000..b0a6530
--- /dev/null
+++ b/Prebuild/scripts/Clean.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./prebuild /clean /removedir obj /file ../prebuild.xml /pause
+rm -rf ../Makefile
diff --git a/Prebuild/scripts/autotools.sh b/Prebuild/scripts/autotools.sh
index 18cd46f..4d140ce 100755
--- a/Prebuild/scripts/autotools.sh
+++ b/Prebuild/scripts/autotools.sh
@@ -1,2 +1,5 @@
 #!/bin/sh
-prebuild /target autotools /file ../prebuild.xml /build NET_2_0 /pause
+RUNTIME=`which mono`
+
+SCRIPTDIR=`dirname $0`
+${RUNTIME} ${SCRIPTDIR}/../Prebuild.exe /target autotools /file ${SCRIPTDIR}/../prebuild.xml /build NET_2_0
diff --git a/Prebuild/scripts/makefile.bat b/Prebuild/scripts/makefile.bat
new file mode 100755
index 0000000..eef9a69
--- /dev/null
+++ b/Prebuild/scripts/makefile.bat
@@ -0,0 +1,4 @@
+@rem Generates makefiles 
+@rem for make
+cd ..
+Prebuild.exe /target makefile /file prebuild.xml /pause
diff --git a/Prebuild/scripts/makefile.sh b/Prebuild/scripts/makefile.sh
new file mode 100755
index 0000000..2e656cb
--- /dev/null
+++ b/Prebuild/scripts/makefile.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+./prebuild /target makefile /file ../prebuild.xml /pause
+
+if [ -f ../Makefile ]
+then
+    rm -rf ../Makefile
+fi
+
+mv ../Prebuild.make ../Makefile
diff --git a/Prebuild/scripts/xcode.bat b/Prebuild/scripts/xcode.bat
new file mode 100755
index 0000000..9883edf
--- /dev/null
+++ b/Prebuild/scripts/xcode.bat
@@ -0,0 +1,4 @@
+@rem Generates a Xcode files 
+@rem for NAnt
+cd ..
+Prebuild.exe /target xcode /file prebuild.xml /pause
diff --git a/Prebuild/scripts/xcode.sh b/Prebuild/scripts/xcode.sh
new file mode 100755
index 0000000..e9b58f9
--- /dev/null
+++ b/Prebuild/scripts/xcode.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+prebuild /target xcode /file ../prebuild.xml /pause