Skip to content

Commit 778f2ce

Browse files
NicoPeters.NPNicoPeters.NP
NicoPeters.NP
authored and
NicoPeters.NP
committed
fixed broken build scripts in prod branch.
git-svn-id: http://oryx-editor.googlecode.com/svn/branches/prod@2749 d672c736-503d-0410-a38a-9366997c882b
1 parent a2318d5 commit 778f2ce

File tree

6 files changed

+53
-638
lines changed

6 files changed

+53
-638
lines changed

build.xml

+36-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<project name="Oryx Main Build Script" basedir="./">
3-
2+
<project name="Oryx Main Build Script">
43
<!-- Load additional properties -->
54
<property file="build.properties"/>
65
<property name="build-dir" value="build" />
@@ -10,13 +9,16 @@
109
<import file="editor/build.xml"/>
1110
<!--<import file="editor/test.xml"/>-->
1211
<import file="poem-jvm/build.xml"/>
13-
<!--<import file="stick/build.xml"/>-->
12+
<import file="stick/build.xml"/>
1413
<import file="mashup/build.xml"/>
1514

15+
1616
<!-- (RE)BUILD EDITOR AND BACKEND -->
1717
<target name="build-all" depends="build-editor, build-backend, generate-build-dependcy-graph" />
18+
1819
<target name="rebuild-all" depends="clean-editor, build-editor, clean-backend, build-backend" />
1920

21+
2022
<!-- CLEAN EDITOR AND BACKEND -->
2123
<target name="clean-all" depends="clean-editor, clean-backend">
2224
<!-- the depencies are somewhat redundant at the moment, but also future-proof -->
@@ -29,9 +31,38 @@
2931

3032
<!-- (UN)DEPLOY EDITOR AND BACKEND -->
3133
<target name="deploy-all" depends="deploy-editor, deploy-backend"/>
34+
3235
<target name="undeploy-all" depends="undeploy-editor, undeploy-backend"/>
36+
37+
38+
<!-- (UN)DEPLOY EDITOR -->
39+
<target name="deploy-editor">
40+
<copy file="${target-dir}/oryx.war" todir="${deploymentdir}"/>
41+
</target>
42+
43+
<target name="undeploy-editor">
44+
<delete file="${deploymentdir}/oryx.war"/>
45+
</target>
46+
47+
<target name="deploy-stencilsets">
48+
<copy todir='${deploymentdir}/oryx/stencilsets'>
49+
<fileset dir="${editor-src-root}/data/stencilsets"/>
50+
</copy>
51+
<echo>
52+
Copied stencilsets into deployment destination
53+
</echo>
54+
</target>
55+
56+
57+
<!-- (UN)DEPLOY REPOSITORY -->
58+
<target name="deploy-backend">
59+
<copy file="${target-dir}/backend.war" tofile="${deploymentdir}/backend.war"/>
60+
</target>
61+
62+
<target name="undeploy-backend">
63+
<delete file="${deploymentdir}/backend.war"/>
64+
</target>
3365

34-
3566
<!-- Generate dependency graph of Ant tasks using Grand
3667
http://www.ggtools.net/grand/
3768
Grand is distributed under the terms of the BSD License. -->
@@ -78,7 +109,7 @@
78109
<srcfiles file="editor/build.xml" />
79110
<srcfiles file="poem-jvm/build.xml" />
80111
<srcfiles file="stick/build.xml" />
81-
<srcfiles file="mashup/build.xml" />
112+
<srcfiles file="MashUp/build.xml" />
82113
</uptodate>
83114
</target>
84115
</project>

buildApps/lib/commons-logging-1.1.jar

-51.7 KB
Binary file not shown.

buildApps/lib/spring-core-2.0.6.jar

-176 KB
Binary file not shown.

0 commit comments

Comments
 (0)