Commit ad3682d
Changed files (4)
build/project.deploy.build
@@ -1,54 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<project name="project.deployment">
<property name="assembly.config" value="${build.config.dir}\AssemblyInfo.cs" />
-
<property name="log4net.config" value="${build.config.dir}\log4net.config.xml" />
-
- <target name="copy.app.dependencies">
- <copy todir="${build.compile.dir}" flatten="true">
- <fileset basedir="${build.lib.dir}\app">
- <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" />
- </target>
-
- <target name="create.licenses" depends="clean">
- <copy todir="${build.compile.dir}" flatten="true">
- <fileset basedir="${build.lib.dir}\app">
- <include name="\**\*.dll" />
- <include name="${build.lib.dir}\app\licenses.licx" />
- </fileset>
- </copy>
- <exec
- basedir="${build.compile.dir}"
- workingdir="${build.compile.dir}"
- program="${dot.net.sdk.dir}\lc.exe"
- commandline="/target:${app.output} /complist:licenses.licx /i:activereports3.dll /i:componentfactory.krypton.navigator.dll /i:componentfactory.krypton.ribbon.dll /i:componentfactory.krypton.toolkit.dll /i:componentfactory.krypton.workspace.dll /i:logicnp.fileview.dll /i:logicnp.folderview.dll /i:logicnp.shcombobox.dll /i:logicnp.shellobjects.dll /nologo /outdir:${build.lib.dir}\app"
- />
- </target>
-
- <!--<target name="deploy" depends="create.licenses">-->
- <target name="deploy">
- <property name="target" value="${assembly.config}" />
- <call target="expand.template.file" />
-
- <call target="app.compile" />
- <call target="copy.app.dependencies" />
- </target>
-
- <target name="run" depends="deploy">
- <exec program="${build.compile.dir}\${app.output}" commandline="" />
- </target>
-
-
+
<target name="create.configs">
<property name="target" value="${log4net.config}" />
<call target="expand.template.file" />
@@ -58,5 +12,11 @@
<call target="expand.template.file" />
<copy file="${build.config.dir}\AssemblyInfo.cs" tofile="${product.dir}\client\boot\Properties\AssemblyInfo.cs" />
</target>
-
+
+ <target name="deploy" depends="create.configs, app.compile" />
+
+ <target name="run" depends="deploy">
+ <exec program="${build.compile.dir}\${app.output}" commandline="" />
+ </target>
+
</project>
build/project.install.build
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<project name="project.installation">
-
- <property name="installation.dir" value="${build.dir}\installation" />
-
- <target name="load_local_properties">
- <property name="application.manifest" value="${installation.dir}\${assembly.version}\${app.output}.manifest" />
- <property name="deployment.manifest" value="${installation.dir}\${app.output}.application" />
- <property name="mage.exe" value="${dot.net.sdk.dir}\mage.exe" />
- </target>
-
- <target name="create.installation.dir" depends="deploy">
- <delete dir="${installation.dir}\${assembly.version}" failonerror="false" />
- <mkdir dir="${installation.dir}\${assembly.version}" />
-
- <copy todir="${installation.dir}\${assembly.version}" flatten="false" >
- <fileset basedir="${build.compile.dir}">
- <include name="**/*" />
- </fileset>
- </copy>
- </target>
-
- <target name="convert.bootstrap">
- <copy file="${bootstrap.file}.template" tofile="${bootstrap.file}" overwrite="true">
- <filterchain>
- <replacetokens>
- <token key="deployment.manifest" value="${deployment.manifest}" />
- <token key="deployment.manifest.file.name" value="${app.output}.application" />
- <token key="installation.dir" value="${installation.dir}" />
- <token key="deployment.url" value="${deployment.url}" />
- </replacetokens>
- </filterchain>
- </copy>
- </target>
-
- <target name="create.bootstrap" depends="load_local_properties">
- <property name="bootstrap.file" value="${build.config.dir}\bootstrap.xml" />
- <call target="convert.bootstrap" />
- <property name="msbuild.exe" value="${framework.dir}\msbuild.exe" />
- <exec program="${msbuild.exe}" commandline="/toolsversion:3.5 ${bootstrap.file}" />
-
- <property name="target.exe" value="${installation.dir}\setup.exe" />
- <call target="sign.code" />
- </target>
-
- <target name="installer" depends="load_local_properties,create.installation.dir,create.bootstrap">
- <property name="args.new.application" value="-n Application -t ${application.manifest} -fd ${build.compile.dir} -v ${assembly.version} -n momoney -cf ${certificate.filename} -pwd ${certificate.password} -pub mokhan.ca -tr FullTrust -UseManifestForTrust true -wpf false" />
- <property name="args.new.deployment" value="-n Deployment -t ${deployment.manifest} -pu ${deployment.url}/${app.output}.application -appm ${application.manifest} -i true -v ${assembly.version} -appc ${deployment.url}\${assembly.version}\${app.output}.manifest -cf ${certificate.filename} -pwd ${certificate.password} -n momoney -pub mokhan.ca -wpf false" />
- <property name="args.update.deployment" value="-u ${deployment.manifest} -appm ${application.manifest} -v ${assembly.version}" />
- <property name="args.sign.application" value="-s ${application.manifest} -cf ${certificate.filename} -Password ${certificate.password}" />
- <property name="args.sign.deployment" value="-s ${deployment.manifest} -cf ${certificate.filename} -Password ${certificate.password}" />
-
- <exec program="${mage.exe}" commandline="${args.new.application}" />
- <exec program="${mage.exe}" commandline="${args.sign.application}" />
- <exec program="${mage.exe}" commandline="${args.new.deployment}" />
- <exec program="${mage.exe}" commandline="${args.update.deployment}" />
- <exec program="${mage.exe}" commandline="${args.sign.deployment}" />
- </target>
-
- <target name="sign.code">
- <echo message="signing ${target.exe}" />
- <!--<exec program="${dot.net.sdk.dir}\signtool.exe"
- commandline="sign /f ${certificate.filename} /p ${certificate.password} /t http://timestamp.verisign.com/scripts/timstamp.dll ${target.exe}"
- />-->
- </target>
-
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="project.installation">
+
+ <property name="installation.dir" value="${build.dir}\installation" />
+
+ <target name="load_local_properties">
+ <property name="application.manifest" value="${installation.dir}\${assembly.version}\${app.output}.manifest" />
+ <property name="deployment.manifest" value="${installation.dir}\${app.output}.application" />
+ <property name="mage.exe" value="${dot.net.sdk.dir}\mage.exe" />
+ </target>
+
+ <target name="create.installation.dir" depends="deploy">
+ <delete dir="${installation.dir}\${assembly.version}" failonerror="false" />
+ <mkdir dir="${installation.dir}\${assembly.version}" />
+
+ <copy todir="${installation.dir}\${assembly.version}" flatten="false" >
+ <fileset basedir="${build.compile.dir}">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="convert.bootstrap">
+ <copy file="${bootstrap.file}.template" tofile="${bootstrap.file}" overwrite="true">
+ <filterchain>
+ <replacetokens>
+ <token key="deployment.manifest" value="${deployment.manifest}" />
+ <token key="deployment.manifest.file.name" value="${app.output}.application" />
+ <token key="installation.dir" value="${installation.dir}" />
+ <token key="deployment.url" value="${deployment.url}" />
+ </replacetokens>
+ </filterchain>
+ </copy>
+ </target>
+
+ <target name="create.bootstrap" depends="load_local_properties">
+ <property name="bootstrap.file" value="${build.config.dir}\bootstrap.xml" />
+ <call target="convert.bootstrap" />
+ <property name="msbuild.exe" value="${framework.dir}\msbuild.exe" />
+ <exec program="${msbuild.exe}" commandline="/toolsversion:3.5 ${bootstrap.file}" />
+
+ <property name="target.exe" value="${installation.dir}\setup.exe" />
+ <call target="sign.code" />
+ </target>
+
+ <target name="installer" depends="load_local_properties,create.installation.dir,create.bootstrap">
+ <property name="args.new.application" value="-n Application -t ${application.manifest} -fd ${build.compile.dir} -v ${assembly.version} -n momoney -cf ${certificate.filename} -pwd ${certificate.password} -pub mokhan.ca -tr FullTrust -UseManifestForTrust true -wpf false" />
+ <property name="args.new.deployment" value="-n Deployment -t ${deployment.manifest} -pu ${deployment.url}/${app.output}.application -appm ${application.manifest} -i true -v ${assembly.version} -appc ${deployment.url}\${assembly.version}\${app.output}.manifest -cf ${certificate.filename} -pwd ${certificate.password} -n momoney -pub mokhan.ca -wpf false" />
+ <property name="args.update.deployment" value="-u ${deployment.manifest} -appm ${application.manifest} -v ${assembly.version}" />
+ <property name="args.sign.application" value="-s ${application.manifest} -cf ${certificate.filename} -Password ${certificate.password}" />
+ <property name="args.sign.deployment" value="-s ${deployment.manifest} -cf ${certificate.filename} -Password ${certificate.password}" />
+
+ <exec program="${mage.exe}" commandline="${args.new.application}" />
+ <exec program="${mage.exe}" commandline="${args.sign.application}" />
+ <exec program="${mage.exe}" commandline="${args.new.deployment}" />
+ <exec program="${mage.exe}" commandline="${args.update.deployment}" />
+ <exec program="${mage.exe}" commandline="${args.sign.deployment}" />
+ </target>
+
+ <target name="sign.code">
+ <echo message="signing ${target.exe}" />
+ <!--<exec program="${dot.net.sdk.dir}\signtool.exe"
+ commandline="sign /f ${certificate.filename} /p ${certificate.password} /t http://timestamp.verisign.com/scripts/timstamp.dll ${target.exe}"
+ />-->
+ </target>
+
</project>
\ No newline at end of file
build/project.test.build
@@ -3,42 +3,8 @@
<property name="test.output" value="tests.dll" />
<property name="xunit.cons.exe" value="${build.tools.dir}\gallio\gallio.echo.exe" />
- <fileset id="test.references.fileset">
- <include name="${build.lib.dir}\**\*.dll" />
- <include name="${build.compile.dir}\${app.output}" />
- </fileset>
-
- <target name="test.compile" depends="app.compile, test.copy.dependencies">
- <!--<csc output="${build.compile.dir}\${test.output}" target="library" debug="${debug}">
- <sources basedir="${product.dir}">
- <include name="**\*Specs.cs" />
- <include name="tests\**\*.cs" />
- </sources>
- <references refid="test.references.fileset"/>
- </csc>-->
- </target>
-
- <target name="test.copy.dependencies">
- <!--<copy todir="${build.compile.dir}" flatten="true">
- <fileset basedir="${build.lib.dir}">
- <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" />-->
- </target>
-
- <target name="run.test" depends="test.compile">
- <exec
- program="${xunit.cons.exe}"
- workingdir="${build.compile.dir}"
- commandline="${xunit.arguments}" />
+ <target name="run.test" depends="app.compile">
+ <exec program="${xunit.cons.exe}" workingdir="${build.compile.dir}" commandline="${xunit.arguments}" />
</target>
<target name="test">
.gitignore
@@ -15,6 +15,7 @@ _ReSharper.*
*.bootstrap.xml
AssemblyInfo.cs
build/config/AssemblyInfo.cs
+build/config/bootstrap.xml
compile
artifacts
installation