Skip to content

Commit c2c109e

Browse files
gaocegegegaocegege
committed
scripts: Update the dep about core.jar and pde.jar
Closes #13 and #42 Signed-off-by: Ce Gao <ce.gao@outlook.com>
1 parent 9e6fac7 commit c2c109e

File tree

6 files changed

+58
-96
lines changed

6 files changed

+58
-96
lines changed

‎.ci/init.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ set modes="c:\\mock-user\\modes"
77
set executable="c:\\mock-user\\Processing"
88
REM # Those paths are important to build runner.jar.
99
set processing="c:\\projects\\processing-3.3"
10-
set core="c:\\projects\\processing-3.3\\core\\library"
11-
set pde="c:\\projects\\processing-3.3\\lib"
10+
set core="c:\\projects\\processing-3.3\\core\\library\\core.jar"
11+
set pde="c:\\projects\\processing-3.3\\lib\\pde.jar"
1212
set renjin="lib\\renjin-script-engine-0.8.2194-jar-with-dependencies.jar"
1313

1414
set processingr="c:\projects\Processing.R"

‎.ci/init.sh‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# init.sh establishes a initial environment to build Processing.R in travis.
4-
# Most of the code is copied from `scripts/generate-ant-file.sh`
5-
6-
# Timestamped log, e.g. log "cluster created".
7-
#
8-
# Input:
9-
# $1 Log string.
10-
function log {
11-
echo -e "[`TZ=Asia/Shanghai date`] ${1}"
12-
}
13-
14-
root=$(dirname "${BASH_SOURCE}")/..
3+
source "$(dirname "${BASH_SOURCE}")/../scripts/utils/generator-util.sh"
154

165
# Download Processing.
176
curl -L http://download.processing.org/processing-3.3-linux64.tgz > $HOME/processing.tgz && \
@@ -26,18 +15,8 @@ modes="/mock-user/modes"
2615
executable="/mock-user/Processing"
2716
# Those paths are important to build runner.jar.
2817
processing="$HOME/processing"
29-
core="$HOME/processing/core/library/"
30-
pde="$HOME/processing/lib/"
31-
renjin="lib/renjin-script-engine-0.8.2194-jar-with-dependencies.jar"
18+
core="$HOME/processing/core/library/core.jar"
19+
pde="$HOME/processing/lib/pde.jar"
3220

33-
cd ${root}
34-
cp build.xml.template build.xml
35-
# Interpret config template.
36-
log "Inject the config to build.xml.template"
37-
perl -i -pe "s|\@\@modes\@\@|${modes}|g" build.xml
38-
perl -i -pe "s|\@\@executable\@\@|${executable}|g" build.xml
39-
perl -i -pe "s|\@\@processing\@\@|${processing}|g" build.xml
40-
perl -i -pe "s|\@\@core\@\@|${core}|g" build.xml
41-
perl -i -pe "s|\@\@pde\@\@|${pde}|g" build.xml
42-
perl -i -pe "s|\@\@renjin\@\@|${renjin}|g" build.xml
43-
cd - > /dev/null
21+
# Call functions in utils/generator-util.sh
22+
generate-build-config ${modes} ${executable} ${core} ${pde}

‎.docker/generate-ant-file-in-docker.sh‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# init.sh establishes a initial environment to build Processing.R in travis.
4-
# Most of the code is copied from `scripts/generate-ant-file.sh`
5-
6-
# Timestamped log, e.g. log "cluster created".
7-
#
8-
# Input:
9-
# $1 Log string.
10-
function log {
11-
echo -e "[`TZ=Asia/Shanghai date`] ${1}"
12-
}
13-
14-
root=$(dirname "${BASH_SOURCE}")/..
3+
source "$(dirname "${BASH_SOURCE}")/../scripts/utils/generator-util.sh"
154

165
# Paths
176
# Those paths are not needed when building runner.jar,
@@ -20,18 +9,8 @@ modes="/mock-user/modes"
209
executable="/mock-user/Processing"
2110
# Those paths are important to build runner.jar.
2211
processing="/code/processing"
23-
core="/code/processing/core/library/"
24-
pde="/code/processing/lib/"
25-
renjin="lib/renjin-script-engine-0.8.2194-jar-with-dependencies.jar"
12+
core="/code/processing/core/library/core.jar"
13+
pde="/code/processing/lib/pde.jar"
2614

27-
cd ${root}
28-
cp build.xml.template build.xml
29-
# Interpret config template.
30-
log "Inject the config to build.xml.template"
31-
perl -i -pe "s|\@\@modes\@\@|${modes}|g" build.xml
32-
perl -i -pe "s|\@\@executable\@\@|${executable}|g" build.xml
33-
perl -i -pe "s|\@\@processing\@\@|${processing}|g" build.xml
34-
perl -i -pe "s|\@\@core\@\@|${core}|g" build.xml
35-
perl -i -pe "s|\@\@pde\@\@|${pde}|g" build.xml
36-
perl -i -pe "s|\@\@renjin\@\@|${renjin}|g" build.xml
37-
cd - > /dev/null
15+
# Call functions in utils/generator-util.sh
16+
generate-build-config ${modes} ${executable} ${core} ${pde}

‎build.xml.template‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,8 @@
3030
<property name="result.exec.file" location="${test.build.dir}/jacoco.exec"/>
3131

3232
<path id="library-classpath">
33-
<fileset dir="${processing.classes.core}">
34-
<include name="*.jar" />
35-
</fileset>
36-
<fileset dir="${processing.classes.pde}">
37-
<include name="*.jar" />
38-
</fileset>
33+
<pathelement location="${processing.classes.core}"/>
34+
<pathelement location="${processing.classes.pde}"/>
3935
<fileset dir="lib">
4036
<include name="*.jar" />
4137
</fileset>
@@ -73,7 +69,7 @@
7369
<manifest>
7470
<attribute name="Main-Class" value="rprocessing.Runner" />
7571
</manifest>
76-
<zipgroupfileset dir="${processing.classes.core}" includes="**/*.jar" />
72+
<zipgroupfileset file="${processing.classes.core}" includes="${processing.classes.core}" />
7773
<zipgroupfileset dir="${lib}" includes="**/*.jar" />
7874
</jar>
7975
</target>

‎scripts/generate-ant-file.sh‎

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,12 @@
11
#!/usr/bin/env bash
22

3-
# Timestamped log, e.g. log "cluster created".
4-
#
5-
# Input:
6-
# $1 Log string.
7-
function log {
8-
echo -e "[`TZ=Asia/Shanghai date`] ${1}"
9-
}
10-
11-
root=$(dirname "${BASH_SOURCE}")/..
3+
source "$(dirname "${BASH_SOURCE}")/utils/generator-util.sh"
124

135
# Path to be changed
146
modes="/Users/gaoce/Documents/Processing/modes"
157
executable="/Applications/Processing.app/Contents/MacOS/Processing"
16-
core="../processing/core/library/"
17-
pde="../processing/app/"
18-
19-
# Static path
20-
renjin="lib/renjin-script-engine-0.8.2194-jar-with-dependencies.jar"
21-
22-
# Build core.jar.
23-
cd ${core}/..
24-
ant build
25-
cd - > /dev/null
26-
27-
# Build pde.jar.
28-
cd ${pde}
29-
ant build
30-
cd - > /dev/null
8+
core="/Applications/Processing.app/Contents/Java/core.jar"
9+
pde="/Applications/Processing.app/Contents/Java/pde.jar"
3110

32-
cd ${root}
33-
cp build.xml.template build.xml
34-
# Interpret config template.
35-
log "Inject the config to build.xml.template"
36-
perl -i -pe "s|\@\@modes\@\@|${modes}|g" build.xml
37-
perl -i -pe "s|\@\@executable\@\@|${executable}|g" build.xml
38-
perl -i -pe "s|\@\@processing\@\@|${processing}|g" build.xml
39-
perl -i -pe "s|\@\@core\@\@|${core}|g" build.xml
40-
perl -i -pe "s|\@\@pde\@\@|${pde}|g" build.xml
41-
perl -i -pe "s|\@\@renjin\@\@|${renjin}|g" build.xml
42-
cd - > /dev/null
11+
# Call functions in utils/generator-util.sh
12+
generate-build-config ${modes} ${executable} ${core} ${pde}

‎scripts/utils/generator-util.sh‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/usr/bin/env bash
2+
3+
# Timestamped log, e.g. log "started to build the binary".
4+
#
5+
# Input:
6+
# $1 Log string.
7+
function log {
8+
echo -e "[`TZ=Asia/Shanghai date`] ${1}"
9+
}
10+
11+
function help {
12+
log "There are 4 paths needed: mode directory, path to executable, path to core.jar, and path to pde.jar."
13+
}
14+
15+
function generate-build-config {
16+
local root=$(dirname "${BASH_SOURCE}")/../..
17+
18+
if [[ $# -ne 4 ]]; then
19+
log "The number of parameters is $#, which does not match ${FUNCNAME} in ${BASH_SOURCE}."
20+
help
21+
exit 1
22+
fi
23+
# Static path
24+
local renjin="lib/renjin-script-engine-0.8.2194-jar-with-dependencies.jar"
25+
26+
cd ${root}
27+
cp build.xml.template build.xml
28+
# Interpret config template.
29+
log "Inject the config to build.xml.template"
30+
perl -i -pe "s|\@\@modes\@\@|${1}|g" build.xml
31+
perl -i -pe "s|\@\@executable\@\@|${2}|g" build.xml
32+
perl -i -pe "s|\@\@core\@\@|${3}|g" build.xml
33+
perl -i -pe "s|\@\@pde\@\@|${4}|g" build.xml
34+
35+
# Static path
36+
perl -i -pe "s|\@\@renjin\@\@|${renjin}|g" build.xml
37+
cd - > /dev/null
38+
}

0 commit comments

Comments
 (0)