royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [royale-asjs] branch feature/as2wasm updated: ‘lib’ is cleaned before we can get to all files… doh!
Date Fri, 17 Nov 2017 13:56:38 GMT
This is an automated email from the ASF dual-hosted git repository.

erikdebruin pushed a commit to branch feature/as2wasm
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/feature/as2wasm by this push:
     new c2e9442  ‘lib’ is cleaned before we can get to all files… doh!
c2e9442 is described below

commit c2e94420ac89e9d8917331d8092bd341f8137a21
Author: Erik de Bruin <erik@ixsoftware.nl>
AuthorDate: Fri Nov 17 14:56:30 2017 +0100

    ‘lib’ is cleaned before we can get to all files… doh!
    
    Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
---
 as2wasm/dev-build.xml | 2 +-
 as2wasm/package.json  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/as2wasm/dev-build.xml b/as2wasm/dev-build.xml
index 6a3e853..3b824e6 100644
--- a/as2wasm/dev-build.xml
+++ b/as2wasm/dev-build.xml
@@ -23,7 +23,7 @@
   <target name="main" depends="compiler.jx,as2wasm.jars" description="Full build"/>
 
   <target name="compiler.jx" description="Builds Royale JS Transpiler jars">
-    <ant dir="./lib/resources/royale-compiler/compiler-jx">
+    <ant dir="./resources/royale-compiler/compiler-jx">
       <target name="clean" />
       <target name="main" />
     </ant>
diff --git a/as2wasm/package.json b/as2wasm/package.json
index b7ab414..4be3392 100644
--- a/as2wasm/package.json
+++ b/as2wasm/package.json
@@ -12,8 +12,8 @@
     "as2wasm-jars": "ant -f ./dev-build.xml",
     "build": "npm install; npm run build-wat2wasm; npm run build-compiler; npm run as2wasm-jars;
node download.js -playerglobal-version=25",
     "build-compiler": "npm run build-compiler-clone; npm run build-compiler-build",
-    "build-compiler-build": "cd lib/resources/royale-compiler; git checkout feature/as2wasm;
git pull; ant sdk",
-    "build-compiler-clone": "mkdir -p lib/resources ; git clone https://github.com/apache/royale-compiler.git
lib/resources/royale-compiler",
+    "build-compiler-build": "cd resources/royale-compiler; git checkout feature/as2wasm;
git pull; ant sdk",
+    "build-compiler-clone": "git clone https://github.com/apache/royale-compiler.git resources/royale-compiler",
     "build-wat2wasm": "echo 'npm install -g webassembly-binary-toolkit'",
     "create-project": "node create.js"
   },

-- 
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <commits@royale.apache.org>'].

Mime
View raw message