Skip to content

Commit

Permalink
Move web client source to src/js directory
Browse files Browse the repository at this point in the history
  • Loading branch information
AntumDeluge committed Mar 1, 2024
1 parent 36dcb80 commit 0910a21
Show file tree
Hide file tree
Showing 188 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build.ant.properties
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ buildroot = build
build-archive = build-archive
src = src
testsrc = tests
srcjs = srcjs
srcjs = ${src}/js
docu = data/docu
maps = data/maps
data = data/gui
Expand Down
16 changes: 8 additions & 8 deletions buildtools/ant_modules/dist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -700,18 +700,18 @@


<target name="js-invoke-compiler">
<exec executable="npx${executable.suffix}" dir="srcjs/stendhal" failonerror="true">
<exec executable="npx${executable.suffix}" dir="${srcjs}/stendhal" failonerror="true">
<arg value="tsc"/>
</exec>

<property name="js-debug" value="--debug --formatting=PRETTY_PRINT --create_source_map srcjs/stendhal-compiled.js.map --source_map_include_content"/>
<property name="js-debug" value="--debug --formatting=PRETTY_PRINT --create_source_map ${srcjs}/stendhal-compiled.js.map --source_map_include_content"/>

<property name="js-files-license" value="srcjs/stendhal/license.js"/>
<property name="js-files-license" value="${srcjs}/stendhal/license.js"/>
<property name="js-files-marauroa" value="build/js/marauroa.js build/js/client-framework.js build/js/message-factory.js build/js/perception.js build/js/rpfactory.js build/js/inflate.js build/js/deserializer.js"/>
<property name="js-files-config" value="build/js/build.js"/>
<property name="js-files-lib1" value="srcjs/jsxgraph-util.js"/>
<property name="js-files-lib1" value="${srcjs}/jsxgraph-util.js"/>
<property name="js-files-lib2" value=""/>
<property name="js-files-data1" value="srcjs/stendhal/data/sha3.js"/>
<property name="js-files-data1" value="${srcjs}/stendhal/data/sha3.js"/>
<property name="js-files-data2" value=""/>
<property name="js-files-entity5" value=""/>
<property name="js-files-entity6" value=""/>
Expand All @@ -720,7 +720,7 @@
<property name="js-files-ui3" value=""/>
<property name="js-files-main1" value=""/>
<property name="js-files-ui4" value=""/>
<property name="js-files-main2" value="srcjs/stendhal/main.js"/>
<property name="js-files-main2" value="${srcjs}/stendhal/main.js"/>
<property name="js-files-main3" value=""/>
<property name="js-files-ts" value="build/ts/*.js build/ts/**/*.js"/>
<property name="js-files-ts2" value=""/>
Expand All @@ -741,7 +741,7 @@
<!-- DEBUG: -->
<!--<arg value="-\-jscomp_off=globalThis"/>-->

<arg value="--js_output_file=srcjs/stendhal-compiled.js"/>
<arg value="--js_output_file=${srcjs}/stendhal-compiled.js"/>

<arg line="${js-files-license}"/>
<arg line="${js-files-marauroa}"/>
Expand All @@ -763,7 +763,7 @@
<arg line="${js-files-ts2}"/>
</java>

<echo file="srcjs/stendhal-compiled.js" append="true">
<echo file="${srcjs}/stendhal-compiled.js" append="true">
//# sourceMappingURL=stendhal-compiled.js.map
</echo>

Expand Down
2 changes: 1 addition & 1 deletion buildtools/ant_modules/docs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<arg value="typedoc"/>
<arg value="--no-save"/>
</exec>
<exec executable="npx${executable.suffix}" dir="srcjs/stendhal" failonerror="true">
<exec executable="npx${executable.suffix}" dir="${srcjs}/stendhal" failonerror="true">
<arg value="typedoc"/>
<arg value="--entryPointStrategy"/>
<arg value="expand"/>
Expand Down
2 changes: 1 addition & 1 deletion buildtools/ant_modules/tools.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<classpath>
<pathelement path="${build_stendhaltools}"/>
</classpath>
<arg value="srcjs/"/>
<arg value="${srcjs}/"/>
<arg value="js,ts,css"/>
</java>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion srcjs/stendhal/main.js → src/js/stendhal/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var marauroa = window.marauroa = window.marauroa || {};
var stendhal = window.stendhal = window.stendhal || {};


stendhal.main = require("../../build/ts/Client").Client.get();
stendhal.main = require("../../../build/ts/Client").Client.get();
stendhal.main.init();

document.addEventListener('DOMContentLoaded', stendhal.main.startup);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"lib": ["dom", "es2015"],
"module": "commonjs",
"noImplicitOverride": true,
"outDir": "../../build/ts",
"outDir": "../../../build/ts",
"rootDir": ".",
"sourceMap": true,
"strict": true,
"target": "es6"
},
"typedocOptions": {
"entryPoints": ["."],
"out": "../../build/build_docs/reference/typescript"
"out": "../../../build/build_docs/reference/typescript"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 0910a21

Please sign in to comment.