Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch wip-gradle-modernization
Excluding Merge-Ins
This is equivalent to a diff from
5ac5baac33
to 8f1816204b
2020-03-02
| | |
05:18 |
|
check-in: a5aaa48037 user: stephanie.gawroriski tags: trunk, x-date-202003
|
05:05 |
|
Closed-Leaf
check-in: 8f1816204b user: stephanie.gawroriski tags: wip-gradle-modernization
|
04:45 |
|
check-in: 9457ff90e4 user: stephanie.gawroriski tags: wip-gradle-modernization
|
2020-02-15
| | |
08:03 |
|
check-in: 1b0f4e8f10 user: squirreljme tags: trunk
|
2020-02-14
| | |
00:19 |
|
check-in: e2ed788c2b user: stephanie.gawroriski tags: wip-gradle-modernization
|
2020-02-08
| | |
15:31 |
|
check-in: 5ac5baac33 user: stephanie.gawroriski tags: trunk
|
2020-02-06
| | |
08:03 |
|
check-in: b1e504d827 user: squirreljme tags: trunk
|
| | |
Changes to .circleci/config.yml.
︙ | | |
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
|
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
+
+
-
-
-
-
-
+
-
-
-
-
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
-
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
|
# DESCRIPTION: CircleCI Build Configuration
version: 2.1
executors:
buildenv:
docker:
- image: circleci/openjdk:8-jdk
working_directory: ~/squirreljme-build
orbs:
win: circleci/windows@2.2.0
commands:
initialize_buildenv:
description: "Initializes the build environment"
steps:
- checkout:
path: ~/squirreljme
- run:
name: Setup directories
command: mkdir -p ~/squirreljme-build /tmp/summercoat /tmp/summercoat-test
- run:
name: Install build-essential
command: sudo apt-get install --no-install-recommends -y build-essential || true
- run:
name: Install crossbuild-essential-powerpc
command: sudo apt-get install --no-install-recommends -y crossbuild-essential-powerpc || true
- run:
name: Install crossbuild-essential-mips
command: sudo apt-get install --no-install-recommends -y crossbuild-essential-mips || true
- run:
name: Install crossbuild-essential-mipsel
command: sudo apt-get install --no-install-recommends -y crossbuild-essential-mipsel || true
- run:
name: Install qemu-user
command: sudo apt-get install --no-install-recommends -y qemu-user || true
- run:
name: Install unzip
command: sudo apt-get install --no-install-recommends -y unzip || true
jobs:
build_javase_windows:
build_windows:
executor:
name: win/default
shell: cmd.exe
steps:
- checkout:
- checkout
path: c:\users\circleci\squirreljme
- run:
name: Make build directory
command: mkdir c:\users\circleci\squirreljme-build
- run:
name: Go to build directory
command: cd c:\users\circleci\squirreljme-build
name: Gradle Build
command: gradlew build --continue --parallel
- run:
name: Perform Shaded Java SE Build
command: c:\users\circleci\squirreljme\build.cmd dist javase
build_javase:
executor: buildenv
shell: cmd.exe
steps:
- initialize_buildenv
- run:
name: Shade JavaSE
command: ~/squirreljme/build.sh dist javase
name: Save test results
command: |
build_javame:
executor: buildenv
steps:
- initialize_buildenv
- run:
mkdir -p /c/users/circleci/test-results/junit
/usr/bin/find . -type f -regex '.*/build/test-results/.*xml' -exec cp {} /c/users/circleci/test-results/junit/ \;
when: always
name: Shade JavaME
command: ~/squirreljme/build.sh dist javame
build_summercoatrom:
executor: buildenv
steps:
shell: bash.exe
- store_test_results:
- initialize_buildenv
- run:
name: Building SummerCoat ROM
command: ~/squirreljme/build.sh dist summercoatrom
- run:
name: UnZip SummerCoat ROM
command: unzip -o squirreljme-summercoatrom.zip
- run:
name: Copy ROM file
command: cp -v squirreljme.sqc /tmp/summercoat/squirreljme.sqc
- persist_to_workspace:
root: /tmp/summercoat
paths:
- squirreljme.sqc
path: c:\users\circleci\test-results
- store_artifacts:
build_summercoatromtest:
executor: buildenv
steps:
- initialize_buildenv
- run:
name: Building SummerCoat Test ROM
command: ~/squirreljme/build.sh dist summercoatrom-test
- run:
name: UnZip SummerCoat ROM
command: unzip -o squirreljme-summercoatrom-test.zip
- run:
name: Copy ROM file
command: cp -v squirreljme.sqc /tmp/summercoat-test/squirreljme.sqc
- persist_to_workspace:
root: /tmp/summercoat-test
paths:
path: c:\users\circleci\test-results
- squirreljme.sqc
tests_baseline:
build_linux:
executor: buildenv
steps:
- initialize_buildenv
- run:
- checkout
name: Clear old test results and snapshot
command: rm -f bljut/baseline/results.xml baseline.nps
- run:
name: Create test directory
command: mkdir -p bljut/baseline
name: Gradle Build
command: ./gradlew build --continue --parallel
- run:
name: Running Baseline Tests
command: ~/squirreljme/utils-dev/hostedlaunch.sh tac-runner > bljut/baseline/results.xml
- store_test_results:
path: bljut
tests_springcoat:
executor: buildenv
steps:
- initialize_buildenv
- run:
name: Clear old test results and snapshot
command: rm -f spjut/springcoat/results.xml springcoat.nps
- run:
name: Create test directory
command: mkdir -p spjut/springcoat
- run:
name: Running SpringCoat VM
command: ~/squirreljme/build.sh launch -v springcoat -n springcoat.nps -Dcc.squirreljme.debug=false tac-runner > spjut/springcoat/results.xml
no_output_timeout: 30m
- store_test_results:
path: spjut
- store_artifacts:
path: springcoat.nps
destination: /nps/springcoat.nps
tests_summercoat:
executor: buildenv
steps:
- initialize_buildenv
- run:
name: Clear old test results and snapshot
command: rm -f sujut/summercoat/results.xml summercoat.nps
- run:
name: Create test directory
command: mkdir -p sujut/summercoat
- run:
name: Running SummerCoat VM
command: ~/squirreljme/build.sh launch -v summercoat -n summercoat.nps -Dcc.squirreljme.debug=false tac-runner > sujut/summercoat/results.xml
- store_test_results:
path: sujut
- store_artifacts:
path: summercoat.nps
destination: /nps/summercoat.nps
tests_summercoatrom:
executor: buildenv
steps:
- initialize_buildenv
- attach_workspace:
at: /tmp/summercoat-test
- run:
name: Clear old test results and snapshot
command: rm -f svjut/summercoatrom/results.xml summercoatrom.nps
- run:
name: Create test directory
command: mkdir -p svjut/summercoatrom
- run:
name: Take SummerCoat Test ROM
command: cp -v /tmp/summercoat-test/squirreljme.sqc .
- run:
name: Save test results
command: |
mkdir -p ~/test-results/junit/
find . -type f -regex '.*/build/test-results/.*xml' -exec cp {} ~/test-results/junit/ \;
when: always
name: Running SummerCoat VM
command: ~/squirreljme/build.sh launch -v summercoat -n summercoatrom.nps -Dcc.squirreljme.debug=false -Dcc.squirreljme.romfile=squirreljme.sqc tac-runner > svjut/summercoatrom/results.xml
- store_test_results:
path: svjut
path: ~/test-results
- store_artifacts:
path: summercoatrom.nps
path: ~/test-results/junit
destination: /nps/summercoatrom.nps
tests_ratufacoat_default:
executor: buildenv
build_macosx:
steps:
- initialize_buildenv
- attach_workspace:
at: /tmp/summercoat-test
- run:
name: Clear old test results and snapshot
command: rm -f rdjut/ratufacoatdef/results.xml
- run:
name: Create test directory
command: mkdir -p rdjut/ratufacoatdef
- run:
name: Take SummerCoat Test ROM
command: cp -v /tmp/summercoat-test/squirreljme.sqc .
- run:
name: Cleaning RatufaCoat VM (Default)
command: make -C ~/squirreljme/ratufacoat -f ~/squirreljme/ratufacoat/makefile clean
- run:
name: Building RatufaCoat VM (Default)
command: make -C ~/squirreljme/ratufacoat -f ~/squirreljme/ratufacoat/makefile squirreljme-stdc
- run:
name: Running RatufaCoat VM (Default)
command: ~/squirreljme/ratufacoat/squirreljme-stdc -Dcc.squirreljme.autolaunch=tac-runner > rdjut/ratufacoatdef/results.xml
- store_test_results:
path: rdjut
tests_ratufacoat_ppc:
executor: buildenv
macos:
xcode: 11.3.0
steps:
- initialize_buildenv
- run:
- checkout
name: Halt if compiler not available
command: if ! which powerpc-linux-gnu-gcc; then circleci-agent step halt; fi
- attach_workspace:
at: /tmp/summercoat-test
- run:
name: Clear old test results and snapshot
command: rm -f rpjut/ratufacoatppc/results.xml
- run:
name: Create test directory
command: mkdir -p rpjut/ratufacoatppc
- run:
name: Take SummerCoat Test ROM
command: cp -v /tmp/summercoat-test/squirreljme.sqc .
- run:
name: Cleaning RatufaCoat VM (PowerPC)
command: make -C ~/squirreljme/ratufacoat -f ~/squirreljme/ratufacoat/makefile clean
- run:
name: Building RatufaCoat VM (PowerPC)
command: make -C ~/squirreljme/ratufacoat -f ~/squirreljme/ratufacoat/makefile squirreljme-stdc CC=powerpc-linux-gnu-gcc CFLAGS='-static -DSJME_BIG_ENDIAN'
- run:
name: Running RatufaCoat VM (PowerPC)
name: Update Brew
command: qemu-ppc ~/squirreljme/ratufacoat/squirreljme-stdc -Dcc.squirreljme.autolaunch=tac-runner > rpjut/ratufacoatppc/results.xml
- store_test_results:
path: rpjut
tests_ratufacoat_mips:
executor: buildenv
steps:
- initialize_buildenv
- run:
name: Halt if compiler not available
command: if ! which mips-linux-gnu-gcc; then circleci-agent step halt; fi
command: brew update
- attach_workspace:
at: /tmp/summercoat-test
- run:
name: Clear old test results and snapshot
command: rm -f rmjut/ratufacoatmips/results.xml
name: Install Gradle and OpenJDK 11
command: brew install gradle openjdk@11
- run:
name: Create test directory
command: mkdir -p rmjut/ratufacoatmips
name: Gradle Build
command: ./gradlew build --continue --parallel
- run:
name: Take SummerCoat Test ROM
command: cp -v /tmp/summercoat-test/squirreljme.sqc .
- run:
name: Save test results
command: |
mkdir -p ~/test-results/junit/
name: Cleaning RatufaCoat VM (MIPS EB)
command: make -C ~/squirreljme/ratufacoat -f ~/squirreljme/ratufacoat/makefile clean
- run:
find . -type f -regex '.*/build/test-results/.*xml' -exec cp {} ~/test-results/junit/ \;
when: always
name: Building RatufaCoat VM (MIPS EB)
command: make -C ~/squirreljme/ratufacoat -f ~/squirreljme/ratufacoat/makefile squirreljme-stdc CC=mips-linux-gnu-gcc CFLAGS='-static -DSJME_BIG_ENDIAN'
- run:
name: Running RatufaCoat VM (MIPS EB)
command: qemu-mips ~/squirreljme/ratufacoat/squirreljme-stdc -Dcc.squirreljme.autolaunch=tac-runner > rmjut/ratufacoatmips/results.xml
- store_test_results:
path: rmjut
path: ~/test-results
tests_ratufacoat_mipsel:
executor: buildenv
steps:
- initialize_buildenv
- run:
name: Halt if compiler not available
command: if ! which mipsel-linux-gnu-gcc; then circleci-agent step halt; fi
- attach_workspace:
at: /tmp/summercoat-test
- run:
name: Clear old test results and snapshot
command: rm -f rnjut/ratufacoatmipsel/results.xml
- run:
name: Create test directory
command: mkdir -p rnjut/ratufacoatmipsel
- run:
name: Take SummerCoat Test ROM
command: cp -v /tmp/summercoat-test/squirreljme.sqc .
- run:
name: Cleaning RatufaCoat VM (MIPS EL)
command: make -C ~/squirreljme/ratufacoat -f ~/squirreljme/ratufacoat/makefile clean
- run:
name: Building RatufaCoat VM (MIPS EL)
command: make -C ~/squirreljme/ratufacoat -f ~/squirreljme/ratufacoat/makefile squirreljme-stdc CC=mipsel-linux-gnu-gcc CFLAGS='-static -DSJME_LITTLE_ENDIAN'
- run:
name: Running RatufaCoat VM (MIPS EL)
command: qemu-mipsel ~/squirreljme/ratufacoat/squirreljme-stdc -Dcc.squirreljme.autolaunch=tac-runner > rnjut/ratufacoatmipsel/results.xml
- store_test_results:
path: rnjut
- store_artifacts:
path: ~/test-results/junit
workflows:
version: 2
tests:
jobs:
- build_javase
- build_javame
- build_windows
- build_linux
- build_javase_windows:
requires:
- build_javase
- build_macosx
- tests_baseline:
requires:
- build_javase
- build_summercoatrom:
requires:
- build_javase
- build_javame
- build_summercoatromtest:
requires:
- build_summercoatrom
- tests_springcoat:
requires:
- build_javase
- tests_summercoat:
requires:
- build_javase
- tests_summercoatrom:
requires:
- build_summercoatromtest
- tests_ratufacoat_default:
requires:
- build_summercoatromtest
- tests_ratufacoat_ppc:
requires:
- build_summercoatromtest
- tests_ratufacoat_mips:
requires:
- build_summercoatromtest
- tests_ratufacoat_mipsel:
requires:
- build_summercoatromtest
|
Added .fossil-settings/binary-glob.
|
1
|
+
|
gradle/wrapper/gradle-wrapper.jar
|
Changes to .fossil-settings/ignore-glob.
︙ | | |
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
+
+
+
+
+
+
+
+
+
+
-
-
|
*.a
*.prc
*.dll
*.exe
*.ttyrec
*.patch
*.diff
# Gradle building
.gradle
modules/build
modules/*/build
emulators/build
emulators/*/build
tools/build
tools/*/build
buildSrc/build
# Files which should be mime encoded
*.png
*.xcf
*.png
*.bmp
*.mid
*.midi
*.wav
*.aif
*.aiff
*.snd
|
Added .gitattributes.
|
1
2
3
|
+
+
+
|
# Do not automatically adjust line endings so that way the line-feeds are
# the same and consistent
* text=false
|
| |
Added .github/workflows/build.yaml.
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
name: Build
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build
run: ./gradlew build --continue --parallel
|
| | | | | | | | | | | | | | |
Added .github/workflows/validate-gradle-wrapper.yaml.
|
1
2
3
4
5
6
7
8
9
10
|
+
+
+
+
+
+
+
+
+
+
|
name: "Validate Gradle Wrapper"
on: [push, pull_request]
jobs:
validation:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
|
| | | | | | | | |
Changes to .gitignore.
︙ | | |
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
+
+
+
+
+
+
+
+
+
+
-
-
|
*.a
*.prc
*.dll
*.exe
*.ttyrec
*.patch
*.diff
# Gradle building
.gradle
modules/build
modules/*/build
emulators/build
emulators/*/build
tools/build
tools/*/build
buildSrc/build
# Files which should be mime encoded
*.png
*.xcf
*.png
*.bmp
*.mid
*.midi
*.wav
*.aif
*.aiff
*.snd
|
Added .idea/checkstyle-idea.xml.
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CheckStyle-IDEA">
<option name="configuration">
<map>
<entry key="checkstyle-version" value="8.29" />
<entry key="copy-libs" value="false" />
<entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
<entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
<entry key="location-2" value="LOCAL_FILE:$PROJECT_DIR$/config/checkstyle/checkstyle.xml:SquirrelJME" />
<entry key="scan-before-checkin" value="false" />
<entry key="scanscope" value="JavaOnlyWithTests" />
<entry key="suppress-errors" value="true" />
</map>
</option>
</component>
</project>
|
| | | | | | | | | | | | | | | |
Added .idea/codeStyles/Project.xml.