From 1e44ec84bd90ec9078027d1d9d78e83c7d305f2a Mon Sep 17 00:00:00 2001 From: BlueWall Date: Tue, 31 Aug 2010 17:02:36 -0400 Subject: Build system upgrade: Upgrading Prebuild.exe to correctly construct build solutions for crossplatform tools such as xbuild, monodevelop and nant. NOTE: Module prebuild files will need modification to work, as the prebuild must correctly define the reference path for all assemblies shipped in the OpenSimulator ./bin directory. These include assemblies such as XMLRPC.dll, OpenMetaverse.dll, Nini.dll, etc. . The entries should follow the form: See the distributed prebuild.xml for further examples. Crossplatform tools: xbuild and monodevelop use the vs2008 OpenSim.sln and the .csproj files in each namespace. Changes to the Prebuild.exe are against svn 322 and are included in a patch attached to the mantis. And the dnpb source are available@ svn co https://dnpb.svn.sourceforge.net/svnroot/dnpb dnpb The patches are pending application by the dnpb team. After which, the un-modified upstream Prebuild.exe will work as expected. --- Prebuild/tests/Makefile | 24 ------------------- Prebuild/tests/README.txt | 5 ---- Prebuild/tests/include-001.expected | 46 ------------------------------------ Prebuild/tests/include-001.include | 33 -------------------------- Prebuild/tests/include-001.prebuild | 22 ----------------- Prebuild/tests/include-002-2.include | 8 ------- Prebuild/tests/include-002.expected | 26 -------------------- Prebuild/tests/include-002.include | 14 ----------- Prebuild/tests/include-002.prebuild | 7 ------ 9 files changed, 185 deletions(-) delete mode 100644 Prebuild/tests/Makefile delete mode 100644 Prebuild/tests/README.txt delete mode 100644 Prebuild/tests/include-001.expected delete mode 100644 Prebuild/tests/include-001.include delete mode 100644 Prebuild/tests/include-001.prebuild delete mode 100644 Prebuild/tests/include-002-2.include delete mode 100644 Prebuild/tests/include-002.expected delete mode 100644 Prebuild/tests/include-002.include delete mode 100644 Prebuild/tests/include-002.prebuild (limited to 'Prebuild/tests') diff --git a/Prebuild/tests/Makefile b/Prebuild/tests/Makefile deleted file mode 100644 index 4a8ddf4..0000000 --- a/Prebuild/tests/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# -# Executable -# - -# Executables -PREBUILD = mono ../src/bin/Release/prebuild.exe /target makefile - -# Files -PREBUILDS = $(wildcard *.prebuild) -RESULTS = $(PREBUILDS:prebuild=results) -TESTS = $(PREBUILDS:prebuild=test) - -all: $(TESTS) - -clean: - rm -f *~ *.log - rm -f $(RESULTS) - -%.test: %.prebuild - $(PREBUILD) /log $*.log /file $*.prebuild /ppi $*.results >& /dev/null - if ! cmp $*.expected $*.results; then \ - echo $*.prebuild failed; \ - false; \ - fi diff --git a/Prebuild/tests/README.txt b/Prebuild/tests/README.txt deleted file mode 100644 index 2c2de3b..0000000 --- a/Prebuild/tests/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -There are some tests that are run via a Makfile in this -directory. They haven't been included in any form of unit tests, but -they are there to help test the functionality in some what. Simply -build prebuild (so there is a src/bin/Release/prebuild.exe) and type -`make` in this directory. Everything should pass without errors. diff --git a/Prebuild/tests/include-001.expected b/Prebuild/tests/include-001.expected deleted file mode 100644 index 26374b5..0000000 --- a/Prebuild/tests/include-001.expected +++ /dev/null @@ -1,46 +0,0 @@ - - - - - DEBUG;TRACE - false - bin/Debug - true - - - - - TRACE - bin/Release - true - false - - - - - - DEBUG;TRACE - false - bin/Debug - true - Prebuild.snk - 1595 - - - - - TRACE - bin/Release - true - false - Prebuild.snk - 1595 - - - - - - - - - diff --git a/Prebuild/tests/include-001.include b/Prebuild/tests/include-001.include deleted file mode 100644 index 7f75962..0000000 --- a/Prebuild/tests/include-001.include +++ /dev/null @@ -1,33 +0,0 @@ - - - - DEBUG;TRACE - false - bin/Debug - true - Prebuild.snk - 1595 - - - - - TRACE - bin/Release - true - false - Prebuild.snk - 1595 - - - - - - - diff --git a/Prebuild/tests/include-001.prebuild b/Prebuild/tests/include-001.prebuild deleted file mode 100644 index 8047008..0000000 --- a/Prebuild/tests/include-001.prebuild +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - DEBUG;TRACE - false - bin/Debug - true - - - - - TRACE - bin/Release - true - false - - - - - diff --git a/Prebuild/tests/include-002-2.include b/Prebuild/tests/include-002-2.include deleted file mode 100644 index 661b7f3..0000000 --- a/Prebuild/tests/include-002-2.include +++ /dev/null @@ -1,8 +0,0 @@ - - - DEBUG;TRACE - false - bin/Debug - true - - diff --git a/Prebuild/tests/include-002.expected b/Prebuild/tests/include-002.expected deleted file mode 100644 index 9849658..0000000 --- a/Prebuild/tests/include-002.expected +++ /dev/null @@ -1,26 +0,0 @@ - - - - - DEBUG;TRACE - false - bin/Debug - true - - - - - - DEBUG;TRACE - false - bin/Debug - true - - - - - - - - - diff --git a/Prebuild/tests/include-002.include b/Prebuild/tests/include-002.include deleted file mode 100644 index 64f4058..0000000 --- a/Prebuild/tests/include-002.include +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/Prebuild/tests/include-002.prebuild b/Prebuild/tests/include-002.prebuild deleted file mode 100644 index 9e85f20..0000000 --- a/Prebuild/tests/include-002.prebuild +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - -- cgit v1.1