summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <mkhan@.arcresources.ca>2009-07-21 13:05:18 -0600
committerunknown <mkhan@.arcresources.ca>2009-07-21 13:05:18 -0600
commite5e95ff129afb8bb075da171e9a894c9c6c4f877 (patch)
treed47c956bca88fb9f7dedebd51fb7c819dfdff107
parent3c7db16d5680118b202e6dc0753320fa15941216 (diff)
adjusting the dir paths in the build scripts
-rw-r--r--build/project.build18
-rw-r--r--build/project.test.build9
2 files changed, 3 insertions, 24 deletions
diff --git a/build/project.build b/build/project.build
index 43d3c6a..0eff9bc 100644
--- a/build/project.build
+++ b/build/project.build
@@ -8,11 +8,8 @@
<property name="build.dir" value="${base.dir}\build" />
<property name="thirdparty.dir" value="${base.dir}\thirdparty" />
- <property name="build.tools.dir" value="${build.dir}\tools" />
+ <property name="build.tools.dir" value="${thirdparty.dir}\tools" />
<property name="build.lib.dir" value="${build.dir}\lib" />
- <property name="build.resources.dir" value="${build.dir}\resources" />
- <property name="build.icons.dir" value="${build.resources.dir}\icons" />
- <property name="build.config.dir" value="${build.dir}\config" />
<property name="build.compile.dir" value="${build.dir}\compile" />
<property name="build.artifacts.dir" value="${build.dir}\artifacts" />
@@ -20,9 +17,6 @@
<include buildfile="project.test.build" />
<include buildfile="project.test.reports.build" />
- <include buildfile="project.deploy.build" />
- <include buildfile="project.install.build" />
- <include buildfile="project.ci.build" />
<include buildfile="local.properties.xml" />
<target name="clean">
@@ -35,10 +29,9 @@
</target>
<target name="app.compile" depends="init">
- <csc output="${build.compile.dir}\${app.output}" debug="${debug}" target="library" win32icon="${build.icons.dir}\mokhan.ico" keyfile="${build.config.dir}\mokhan.snk">
+ <csc output="${build.compile.dir}\${app.output}" debug="${debug}" target="library">
<sources>
<include name="${product.dir}\**\*.cs" />
- <include name="${build.config.dir}\**\*.cs" />
<exclude name="${product.dir}\**\AssemblyInfo.cs" />
<exclude name="${product.dir}\**\*Specs.cs" />
</sources>
@@ -46,13 +39,6 @@
<include name="${build.lib.dir}\**\*.dll" />
<include name="${build.artifacts.dir}\**\*.dll" />
</references>
- <resources dynamicprefix="true">
- <include name="${product.dir}\**\*.resx" />
- </resources>
- <resources>
- <include name="${build.lib.dir}\app\*.licenses" />
- </resources>
- <arg value="/nowin32manifest" />
</csc>
</target>
diff --git a/build/project.test.build b/build/project.test.build
index 664d0be..236c970 100644
--- a/build/project.test.build
+++ b/build/project.test.build
@@ -5,8 +5,6 @@
<fileset id="test.references.fileset">
<include name="${build.lib.dir}\**\*.dll" />
- <exclude name="${build.lib.dir}\app\sql.server.compact\**\*.dll" />
- <include name="${build.lib.dir}\app\sql.server.compact\**\System.Data.SqlServerCe.dll" />
</fileset>
<target name="test.compile" depends="init, test.copy.dependencies">
@@ -24,11 +22,6 @@
<include name="\**\*.dll" />
</fileset>
</copy>
- <copy todir="${build.compile.dir}" flatten="false">
- <fileset basedir="${build.resources.dir}">
- <include name="\**\*.*" />
- </fileset>
- </copy>
<property name="target" value="${log4net.config}" />
<call target="expand.template.file" />
<copy file="${log4net.config}" tofile="${build.compile.dir}\log4net.config.xml" />
@@ -37,7 +30,7 @@
<target name="run.test" depends="test.compile">
<exec
program="${xunit.cons.exe}"
- workingdir="${build.compile.dir}"
+ workingdir="${build.compile.dir}"
commandline="${xunit.arguments}" />
</target>