Skip to content

Commit 47c2d14

Browse files
mikebarkminmikebarkmin
committed
move to maven
1 parent ce47e33 commit 47c2d14

File tree

640 files changed

+1200
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

640 files changed

+1200
-1289
lines changed

‎.classpath‎

Lines changed: 60 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,63 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="examples/java"/>
5-
<classpathentry kind="src" path="examples/reference"/>
6-
<classpathentry kind="lib" path="libs/core-4.3.1.jar"/>
7-
<classpathentry kind="lib" path="libs/gluegen-rt-2.5.0.jar"/>
8-
<classpathentry kind="lib" path="libs/guava-mini-0.1.6.jar"/>
9-
<classpathentry kind="lib" path="libs/jackson-annotations-2.18.2.jar"/>
10-
<classpathentry kind="lib" path="libs/jackson-core-2.18.2.jar"/>
11-
<classpathentry kind="lib" path="libs/jackson-databind-2.18.2.jar"/>
12-
<classpathentry kind="lib" path="libs/jackson-dataformat-xml-2.18.2.jar"/>
13-
<classpathentry kind="lib" path="libs/jogl-all-2.5.0.jar"/>
14-
<classpathentry kind="lib" path="libs/jsyn-17.1.0.jar"/>
15-
<classpathentry kind="lib" path="libs/sound.jar"/>
16-
<classpathentry kind="lib" path="libs/stax2-api-4.2.1.jar"/>
17-
<classpathentry kind="lib" path="libs/tritonus-share-0.3.7.4.jar"/>
18-
<classpathentry kind="lib" path="libs/vorbisspi-1.0.3.3.jar"/>
19-
<classpathentry kind="lib" path="libs/woodstox-core-6.5.1.jar"/>
20-
<classpathentry kind="lib" path="libs/word-wrap-0.1.12.jar"/>
21-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
22-
<classpathentry kind="output" path="build"/>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
<attribute name="test" value="true"/>
14+
</attributes>
15+
</classpathentry>
16+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
17+
<attributes>
18+
<attribute name="maven.pomderived" value="true"/>
19+
<attribute name="test" value="true"/>
20+
<attribute name="optional" value="true"/>
21+
</attributes>
22+
</classpathentry>
23+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
24+
<attributes>
25+
<attribute name="maven.pomderived" value="true"/>
26+
</attributes>
27+
</classpathentry>
28+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
29+
<attributes>
30+
<attribute name="maven.pomderived" value="true"/>
31+
</attributes>
32+
</classpathentry>
33+
<classpathentry kind="src" path="target/generated-sources/annotations">
34+
<attributes>
35+
<attribute name="optional" value="true"/>
36+
<attribute name="maven.pomderived" value="true"/>
37+
<attribute name="ignore_optional_problems" value="true"/>
38+
<attribute name="m2e-apt" value="true"/>
39+
</attributes>
40+
</classpathentry>
41+
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/examples/java">
42+
<attributes>
43+
<attribute name="optional" value="true"/>
44+
<attribute name="maven.pomderived" value="true"/>
45+
</attributes>
46+
</classpathentry>
47+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
48+
<attributes>
49+
<attribute name="maven.pomderived" value="true"/>
50+
<attribute name="optional" value="true"/>
51+
</attributes>
52+
</classpathentry>
53+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
54+
<attributes>
55+
<attribute name="optional" value="true"/>
56+
<attribute name="maven.pomderived" value="true"/>
57+
<attribute name="ignore_optional_problems" value="true"/>
58+
<attribute name="m2e-apt" value="true"/>
59+
<attribute name="test" value="true"/>
60+
</attributes>
61+
</classpathentry>
62+
<classpathentry kind="output" path="target/classes"/>
2363
</classpath>

‎.env‎

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,6 @@ function s4j_workdir() {
99
}
1010
alias s4jwd="s4j_workdir"
1111

12-
function s4j_cp() {
13-
cp="$(s4j_workdir)/libs/*"
14-
cp="$cp:$(s4j_workdir)/libs/linux-amd64/*)"
15-
cp="$cp:$(s4j_workdir)/libs/windows-amd64/*)"
16-
cp="$cp:."
17-
echo $cp
18-
}
19-
20-
alias s4jcp="sj4_cp"
21-
22-
function s4j_build() {
23-
pushd $(s4jwd)
24-
ant -f resources/build.xml
25-
popd
26-
}
27-
alias s4jb="s4j_build"
28-
2912
function s4j_diff_docs() {
3013
diff -d <(tree $(s4j_workdir)/docs/en/) <(tree $(s4j_workdir)/docs/de/)
3114
}
@@ -37,31 +20,6 @@ function s4j_lint_docs() {
3720
}
3821
alias s4jld="s4j_lint_docs"
3922

40-
function s4j_compile() {
41-
rm -rf $(s4j_workdir)/bin
42-
43-
# compile code
44-
javac -cp "$(s4j_cp)" $(find . -name '*.java') -d "$(s4j_workdir)/bin"
45-
46-
# extract natives
47-
for native_jar in $(find ./libs/*/* -name "*.jar")
48-
do
49-
unzip -o -q $native_jar "natives/*" -d $(s4j_workdir)/bin
50-
done
51-
52-
# copy data
53-
cp $(s4j_workdir)/data/* $(s4j_workdir)/bin
54-
55-
# copy other files
56-
pushd $(s4j_workdir)/examples/java
57-
find . ! -name '*.java' | cpio -pdm $(s4j_workdir)/bin
58-
popd
59-
pushd $(s4j_workdir)/examples/reference
60-
find . ! -name '*.java' | cpio -pdm $(s4j_workdir)/bin
61-
popd
62-
}
63-
alias s4jc="s4j_compile"
64-
6523
function s4j_extract_natives() {
6624
rm -rf $(s4j_workdir)/bin
6725
# extract natives
@@ -72,36 +30,12 @@ function s4j_extract_natives() {
7230
}
7331
alias s4en="s4j_extract_natives"
7432

75-
function s4j_examples_run() {
76-
pushd examples;
77-
java_file_path=$(find . -name "*.java" -type f -exec grep -lr "main" {} \; | fzf)
78-
java_file_path=$(echo $java_file_path | tr "/" ".")
79-
java_file_path=${java_file_path:2}
80-
java_file_path=${java_file_path%.java}
81-
echo $java_file_path
82-
java -cp $(s4j_cp) $java_file_path
83-
popd;
84-
}
85-
alias s4jer="s4j_examples_run"
86-
87-
function s4j_examples_run_all() {
88-
cp=$(s4j_cp)
89-
for f in $(find ./examples/reference -name "*.class")
90-
do
91-
java_file=${f##*/}
92-
java_dir=${f%/*}
93-
java_name="${java_file%.*}"
94-
java -cp "$cp:bin" $java_name
95-
done
96-
}
97-
alias s4jera="s4j_examples_run_all"
98-
9933
function s4j_examples_copy_to_documentation() {
10034
root=$(s4j_workdir)
10135
folder=$root/docs/$1/public/reference/
10236
rm -rf $folder
10337
mkdir $folder
104-
pushd ./examples/reference
38+
pushd ./src/examples/java/reference
10539
find . -name "*.gif" | cpio -pdm $folder
10640
popd
10741
}

.github/workflows/javadoc.yml renamed to .github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy JavaDoc
1+
name: Deploy
22

33
on:
44
push:
@@ -26,13 +26,13 @@ jobs:
2626
distribution: 'temurin'
2727
java-version: '21'
2828
- name: Build with Maven
29-
run: ant -f resources/build.xml
29+
run: mvn clean package
3030
- name: Setup Pages
3131
uses: actions/configure-pages@v5
3232
- name: Upload artifact
3333
uses: actions/upload-pages-artifact@v3
3434
with:
35-
path: distribution/javadoc
35+
path: target/apidocs
3636
- name: Deploy to GitHub Pages
3737
id: deployment
3838
uses: actions/deploy-pages@v4

‎.github/workflows/format.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ classes
1010
*.class
1111
*.ctxt
1212
*.zip
13+
docs/de/archives
14+
docs/en/archives
1315
docs/en/public/reference
1416
docs/de/public/reference
1517
docs/en/book/changelog.md
@@ -22,3 +24,15 @@ natives
2224

2325
# Ignore Gradle build output directory
2426
build
27+
28+
### Maven ###
29+
target/
30+
pom.xml.tag
31+
pom.xml.releaseBackup
32+
pom.xml.versionsBackup
33+
pom.xml.next
34+
release.properties
35+
dependency-reduced-pom.xml
36+
buildNumber.properties
37+
.mvn/timing.properties
38+
.mvn/wrapper/maven-wrapper.jar

‎.project‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
1520
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1622
</natures>
1723
<filteredResources>
1824
<filter>

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions

‎README.md‎

Lines changed: 7 additions & 1 deletion

‎data/README‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

examples/archives/Halloween/GhostSprite.java renamed to docs/archives/Halloween/GhostSprite.java

File renamed without changes.

0 commit comments

Comments
 (0)