aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Prebuild/tests
diff options
context:
space:
mode:
authorBlueWall2010-08-31 17:02:36 -0400
committerJustin Clark-Casey (justincc)2010-09-04 02:12:21 +0100
commit1e44ec84bd90ec9078027d1d9d78e83c7d305f2a (patch)
treee34db5ced4bc7bf59b98ff9fb72271dda0f25a33 /Prebuild/tests
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-1e44ec84bd90ec9078027d1d9d78e83c7d305f2a.zip
opensim-SC-1e44ec84bd90ec9078027d1d9d78e83c7d305f2a.tar.gz
opensim-SC-1e44ec84bd90ec9078027d1d9d78e83c7d305f2a.tar.bz2
opensim-SC-1e44ec84bd90ec9078027d1d9d78e83c7d305f2a.tar.xz
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: <Reference name="Nini" path="../../../bin/"/> 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.
Diffstat (limited to '')
-rw-r--r--Prebuild/tests/Makefile24
-rw-r--r--Prebuild/tests/README.txt5
-rw-r--r--Prebuild/tests/include-001.expected46
-rw-r--r--Prebuild/tests/include-001.include33
-rw-r--r--Prebuild/tests/include-001.prebuild22
-rw-r--r--Prebuild/tests/include-002-2.include8
-rw-r--r--Prebuild/tests/include-002.expected26
-rw-r--r--Prebuild/tests/include-002.include14
-rw-r--r--Prebuild/tests/include-002.prebuild7
9 files changed, 0 insertions, 185 deletions
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 @@
1#
2# Executable
3#
4
5# Executables
6PREBUILD = mono ../src/bin/Release/prebuild.exe /target makefile
7
8# Files
9PREBUILDS = $(wildcard *.prebuild)
10RESULTS = $(PREBUILDS:prebuild=results)
11TESTS = $(PREBUILDS:prebuild=test)
12
13all: $(TESTS)
14
15clean:
16 rm -f *~ *.log
17 rm -f $(RESULTS)
18
19%.test: %.prebuild
20 $(PREBUILD) /log $*.log /file $*.prebuild /ppi $*.results >& /dev/null
21 if ! cmp $*.expected $*.results; then \
22 echo $*.prebuild failed; \
23 false; \
24 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 @@
1There are some tests that are run via a Makfile in this
2directory. They haven't been included in any form of unit tests, but
3they are there to help test the functionality in some what. Simply
4build prebuild (so there is a src/bin/Release/prebuild.exe) and type
5`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 @@
1<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
2 <Solution name="include-001" version="1.2.3">
3 <Configuration name="Debug">
4 <Options>
5 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
6 <OptimizeCode>false</OptimizeCode>
7 <OutputPath>bin/Debug</OutputPath>
8 <DebugInformation>true</DebugInformation>
9 </Options>
10 </Configuration>
11 <Configuration name="Release">
12 <Options>
13 <CompilerDefines>TRACE</CompilerDefines>
14 <OutputPath>bin/Release</OutputPath>
15 <OptimizeCode>true</OptimizeCode>
16 <DebugInformation>false</DebugInformation>
17 </Options>
18 </Configuration>
19 <Project name="Prebuild" path="src" language="C#" assemblyName="include-001" type="Exe" version="1.2.3" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd">
20 <Configuration name="Debug">
21 <Options>
22 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
23 <OptimizeCode>false</OptimizeCode>
24 <OutputPath>bin/Debug</OutputPath>
25 <DebugInformation>true</DebugInformation>
26 <KeyFile>Prebuild.snk</KeyFile>
27 <SuppressWarnings>1595</SuppressWarnings>
28 </Options>
29 </Configuration>
30 <Configuration name="Release">
31 <Options>
32 <CompilerDefines>TRACE</CompilerDefines>
33 <OutputPath>bin/Release</OutputPath>
34 <OptimizeCode>true</OptimizeCode>
35 <DebugInformation>false</DebugInformation>
36 <KeyFile>Prebuild.snk</KeyFile>
37 <SuppressWarnings>1595</SuppressWarnings>
38 </Options>
39 </Configuration>
40 <Reference name="System" />
41 <Files>
42 <Match pattern="*.cs" recurse="true" />
43 </Files>
44 </Project>
45 </Solution>
46</Prebuild>
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 @@
1<Project name="Prebuild"
2 path="src"
3 language="C#"
4 assemblyName="include-001"
5 type="Exe"
6 version="1.2.3"
7 xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"
8 >
9 <Configuration name="Debug">
10 <Options>
11 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
12 <OptimizeCode>false</OptimizeCode>
13 <OutputPath>bin/Debug</OutputPath>
14 <DebugInformation>true</DebugInformation>
15 <KeyFile>Prebuild.snk</KeyFile>
16 <SuppressWarnings>1595</SuppressWarnings>
17 </Options>
18 </Configuration>
19 <Configuration name="Release">
20 <Options>
21 <CompilerDefines>TRACE</CompilerDefines>
22 <OutputPath>bin/Release</OutputPath>
23 <OptimizeCode>true</OptimizeCode>
24 <DebugInformation>false</DebugInformation>
25 <KeyFile>Prebuild.snk</KeyFile>
26 <SuppressWarnings>1595</SuppressWarnings>
27 </Options>
28 </Configuration>
29 <Reference name="System" />
30 <Files>
31 <Match pattern="*.cs" recurse="true"/>
32 </Files>
33</Project>
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 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
3 <Solution name="include-001" version="1.2.3">
4 <Configuration name="Debug">
5 <Options>
6 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
7 <OptimizeCode>false</OptimizeCode>
8 <OutputPath>bin/Debug</OutputPath>
9 <DebugInformation>true</DebugInformation>
10 </Options>
11 </Configuration>
12 <Configuration name="Release">
13 <Options>
14 <CompilerDefines>TRACE</CompilerDefines>
15 <OutputPath>bin/Release</OutputPath>
16 <OptimizeCode>true</OptimizeCode>
17 <DebugInformation>false</DebugInformation>
18 </Options>
19 </Configuration>
20 <?include file="include-001.include"?>
21 </Solution>
22</Prebuild>
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 @@
1<Configuration name="Debug" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd">
2 <Options>
3 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
4 <OptimizeCode>false</OptimizeCode>
5 <OutputPath>bin/Debug</OutputPath>
6 <DebugInformation>true</DebugInformation>
7 </Options>
8</Configuration>
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 @@
1<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
2 <Solution name="include-002" version="1.2.3">
3 <Configuration name="Debug" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd">
4 <Options>
5 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
6 <OptimizeCode>false</OptimizeCode>
7 <OutputPath>bin/Debug</OutputPath>
8 <DebugInformation>true</DebugInformation>
9 </Options>
10 </Configuration>
11 <Project name="Prebuild" path="src" language="C#" assemblyName="include-001" type="Exe" version="1.2.3" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd">
12 <Configuration name="Debug" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd">
13 <Options>
14 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
15 <OptimizeCode>false</OptimizeCode>
16 <OutputPath>bin/Debug</OutputPath>
17 <DebugInformation>true</DebugInformation>
18 </Options>
19 </Configuration>
20 <Reference name="System" />
21 <Files>
22 <Match pattern="*.cs" recurse="true" />
23 </Files>
24 </Project>
25 </Solution>
26</Prebuild>
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 @@
1<Project name="Prebuild"
2 path="src"
3 language="C#"
4 assemblyName="include-001"
5 type="Exe"
6 version="1.2.3"
7 xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"
8 >
9 <?include file="include-002-2.include"?>
10 <Reference name="System" />
11 <Files>
12 <Match pattern="*.cs" recurse="true"/>
13 </Files>
14</Project>
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 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
3 <Solution name="include-002" version="1.2.3">
4 <?include file="include-002-2.include"?>
5 <?include file="include-002.include"?>
6 </Solution>
7</Prebuild>
generated by cgit v1.1 at 2024-12-17 02:30:13 +0000