Skip to content

Commit 239e5ee

Browse files
committed
Move java_wasm output to src/main/resources
* It is a resource used as source code (in wasm) that is compiled for the project artifact. * Added to Rake CLOBBER
1 parent 0d3a2f2 commit 239e5ee

6 files changed

Lines changed: 7 additions & 5 deletions

File tree

.github/workflows/java-wasm-bindings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ jobs:
4848
- uses: actions/upload-artifact@v4
4949
with:
5050
name: prism.wasm
51-
path: java-wasm/src/test/resources/prism.wasm
51+
path: java-wasm/src/main/resources/prism.wasm

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ all: shared static
3030
shared: build/libprism.$(SOEXT)
3131
static: build/libprism.a
3232
wasm: javascript/src/prism.wasm
33-
java-wasm: java-wasm/src/test/resources/prism.wasm
33+
java-wasm: java-wasm/src/main/resources/prism.wasm
3434

3535
build/libprism.$(SOEXT): $(SHARED_OBJECTS)
3636
$(ECHO) "linking $@ with $(CC)"
@@ -44,8 +44,9 @@ javascript/src/prism.wasm: Makefile $(SOURCES) $(HEADERS)
4444
$(ECHO) "building $@"
4545
$(Q) $(WASI_SDK_PATH)/bin/clang --sysroot=$(WASI_SDK_PATH)/share/wasi-sysroot/ $(DEBUG_FLAGS) -DPRISM_EXPORT_SYMBOLS -D_WASI_EMULATED_MMAN -lwasi-emulated-mman $(CPPFLAGS) $(CFLAGS) -Wl,--export-all -Wl,--no-entry -mexec-model=reactor -o $@ $(SOURCES)
4646

47-
java-wasm/src/test/resources/prism.wasm: Makefile $(SOURCES) $(HEADERS)
47+
java-wasm/src/main/resources/prism.wasm: Makefile $(SOURCES) $(HEADERS)
4848
$(ECHO) "building $@"
49+
$(Q) $(MAKEDIRS) $(@D)
4950
$(Q) $(WASI_SDK_PATH)/bin/clang $(DEBUG_FLAGS) -DPRISM_EXCLUDE_PRETTYPRINT -DPRISM_EXPORT_SYMBOLS -D_WASI_EMULATED_MMAN -lwasi-emulated-mman $(CPPFLAGS) $(JAVA_WASM_CFLAGS) -Wl,--export-all -Wl,--no-entry -mexec-model=reactor -lc++ -lc++abi -o $@ $(SOURCES)
5051

5152
build/shared/%.o: src/%.c Makefile $(HEADERS)

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ end
5252
CLOBBER.concat(Prism::Template::TEMPLATES)
5353
CLOBBER.concat(["build"])
5454
CLOBBER << "lib/prism/prism.#{RbConfig::CONFIG["DLEXT"]}"
55+
CLOBBER << "java-wasm/src/main/resources/prism.wasm"
5556

5657
Prism::Template::TEMPLATES.each do |filepath|
5758
desc "Generate #{filepath}"

java-wasm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
</goals>
123123
<configuration>
124124
<name>org.prism.Prism</name>
125-
<wasmFile>src/test/resources/prism.wasm</wasmFile>
125+
<wasmFile>src/main/resources/prism.wasm</wasmFile>
126126
</configuration>
127127
</execution>
128128
</executions>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.prism;
22

33
public final class WasmResource {
4-
public static final String absoluteFile = "file://${project.basedir}/src/test/resources/prism.wasm";
4+
public static final String absoluteFile = "file://${project.basedir}/src/main/resources/prism.wasm";
55

66
private WasmResource() {}
77
}

0 commit comments

Comments
 (0)