You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2019/11/20 23:00:31 UTC

[royale-typedefs] branch develop updated: use compiler-jx version of compc to build typedefs

This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git


View the commit online:
https://github.com/apache/royale-typedefs/commit/e9595972ca1a6f8410c9752b47160a27de771c15

The following commit(s) were added to refs/heads/develop by this push:
     new e959597  use compiler-jx version of compc to build typedefs
e959597 is described below

commit e9595972ca1a6f8410c9752b47160a27de771c15
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Nov 20 14:58:08 2019 -0800

    use compiler-jx version of compc to build typedefs
    
    It doesn't really matter either way, but we tend to use that version everywhere else, so it feels weird to use the "older" compiler. Plus, compiler-jx has certain defaults that are different for Royale, and it's probably better if those match up with the defaults that we use to build royale-asjs libraries. For instance, we made identifier names less strict for Royale specifically so that we could create typedefs using that feature.
---
 GCL/build.xml                                     | 3 ++-
 GCL/src/main/config/compile-as-config.xml         | 1 +
 ace/build.xml                                     | 3 ++-
 ace/src/main/config/compile-as-config.xml         | 1 +
 cordova/build.xml                                 | 3 ++-
 cordova/src/main/config/compile-as-config.xml     | 1 +
 createjs/build.xml                                | 3 ++-
 createjs/src/main/config/compile-as-config.xml    | 1 +
 google_maps/build.xml                             | 3 ++-
 google_maps/src/main/config/compile-as-config.xml | 1 +
 jasmine/build.xml                                 | 3 ++-
 jasmine/src/main/config/compile-as-config.xml     | 1 +
 jquery/build.xml                                  | 3 ++-
 jquery/src/main/config/compile-as-config.xml      | 1 +
 js/build.xml                                      | 3 ++-
 js/src/main/config/compile-as-config.xml          | 1 +
 node/build.xml                                    | 3 ++-
 node/src/main/config/compile-as-config.xml        | 1 +
 18 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/GCL/build.xml b/GCL/build.xml
index cbb1986..203ac5c 100644
--- a/GCL/build.xml
+++ b/GCL/build.xml
@@ -98,9 +98,10 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" fork="true"
+        <java jar="${ROYALE_TRANSPILER_HOME}/lib/compc.jar" fork="true"
             failonerror="true">
             <arg value="+royalelib=externs/frameworks" />
+            <arg value="-targets=SWF" />
             <arg value="-external-library-path+=${basedir}/../js/target/js.swc" />
             <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
             <arg line="-metadata.date=&quot;${royale.swc-date}&quot;" />
diff --git a/GCL/src/main/config/compile-as-config.xml b/GCL/src/main/config/compile-as-config.xml
index dc85f19..bee65d6 100644
--- a/GCL/src/main/config/compile-as-config.xml
+++ b/GCL/src/main/config/compile-as-config.xml
@@ -31,6 +31,7 @@
 
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
+    <warn-public-vars>false</warn-public-vars>
 
     <include-sources>
         <path-element>../src/main/royale</path-element>
diff --git a/ace/build.xml b/ace/build.xml
index e9d4b5c..58f6da2 100644
--- a/ace/build.xml
+++ b/ace/build.xml
@@ -117,9 +117,10 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" fork="true"
+        <java jar="${ROYALE_TRANSPILER_HOME}/lib/compc.jar" fork="true"
             failonerror="true">
             <arg value="+royalelib=externs/frameworks" />
+            <arg value="-targets=SWF" />
             <arg value="-external-library-path+=${basedir}/../js/target/js.swc" />
             <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
             <arg line="-metadata.date=&quot;${royale.swc-date}&quot;" />
diff --git a/ace/src/main/config/compile-as-config.xml b/ace/src/main/config/compile-as-config.xml
index accfe7a..4717bd9 100644
--- a/ace/src/main/config/compile-as-config.xml
+++ b/ace/src/main/config/compile-as-config.xml
@@ -31,6 +31,7 @@
         
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
+    <warn-public-vars>false</warn-public-vars>
     
     <include-sources>
         <path-element>generated-sources/externc/classes</path-element>
diff --git a/cordova/build.xml b/cordova/build.xml
index 2939fff..ec5f13a 100644
--- a/cordova/build.xml
+++ b/cordova/build.xml
@@ -106,9 +106,10 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" fork="true"
+        <java jar="${ROYALE_TRANSPILER_HOME}/lib/compc.jar" fork="true"
             failonerror="true">
             <arg value="+royalelib=externs/frameworks" />
+            <arg value="-targets=SWF" />
             <arg value="-external-library-path+=${basedir}/../js/target/js.swc" />
             <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
             <arg line="-metadata.date=&quot;${royale.swc-date}&quot;" />
diff --git a/cordova/src/main/config/compile-as-config.xml b/cordova/src/main/config/compile-as-config.xml
index df1e126..1c523d4 100644
--- a/cordova/src/main/config/compile-as-config.xml
+++ b/cordova/src/main/config/compile-as-config.xml
@@ -30,6 +30,7 @@
         
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
+    <warn-public-vars>false</warn-public-vars>
     
     <include-sources>
         <path-element>generated-sources/externc/constants</path-element>
diff --git a/createjs/build.xml b/createjs/build.xml
index aa6fc34..0cb8634 100644
--- a/createjs/build.xml
+++ b/createjs/build.xml
@@ -574,9 +574,10 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" fork="true"
+        <java jar="${ROYALE_TRANSPILER_HOME}/lib/compc.jar" fork="true"
             failonerror="true">
             <arg value="+royalelib=externs/frameworks" />
+            <arg value="-targets=SWF" />
             <arg value="-external-library-path+=${basedir}/../js/target/js.swc" />
             <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
             <arg line="-metadata.date=&quot;${royale.swc-date}&quot;" />
diff --git a/createjs/src/main/config/compile-as-config.xml b/createjs/src/main/config/compile-as-config.xml
index 9b151ea..19360af 100644
--- a/createjs/src/main/config/compile-as-config.xml
+++ b/createjs/src/main/config/compile-as-config.xml
@@ -30,6 +30,7 @@
         
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
+    <warn-public-vars>false</warn-public-vars>
     
     <include-sources>
         <path-element>generated-sources/externc/classes</path-element>
diff --git a/google_maps/build.xml b/google_maps/build.xml
index ac95dbf..98d1717 100644
--- a/google_maps/build.xml
+++ b/google_maps/build.xml
@@ -171,9 +171,10 @@ google.maps = {};]]></replacevalue>
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" fork="true"
+        <java jar="${ROYALE_TRANSPILER_HOME}/lib/compc.jar" fork="true"
             failonerror="true">
             <arg value="+royalelib=externs/frameworks" />
+            <arg value="-targets=SWF" />
             <arg value="-external-library-path+=${basedir}/../js/target/js.swc" />
             <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
             <arg line="-metadata.date=&quot;${royale.swc-date}&quot;" />
diff --git a/google_maps/src/main/config/compile-as-config.xml b/google_maps/src/main/config/compile-as-config.xml
index 1e7a949..e43105f 100644
--- a/google_maps/src/main/config/compile-as-config.xml
+++ b/google_maps/src/main/config/compile-as-config.xml
@@ -31,6 +31,7 @@
         
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
+    <warn-public-vars>false</warn-public-vars>
     
     <include-sources>
         <path-element>generated-sources/externc/classes</path-element>
diff --git a/jasmine/build.xml b/jasmine/build.xml
index a8af77f..7023c82 100644
--- a/jasmine/build.xml
+++ b/jasmine/build.xml
@@ -113,9 +113,10 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" fork="true"
+        <java jar="${ROYALE_TRANSPILER_HOME}/lib/compc.jar" fork="true"
             failonerror="true">
             <arg value="+royalelib=externs/frameworks" />
+            <arg value="-targets=SWF" />
             <arg value="-external-library-path+=${basedir}/../js/target/js.swc" />
             <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
             <arg line="-metadata.date=&quot;${royale.swc-date}&quot;" />
diff --git a/jasmine/src/main/config/compile-as-config.xml b/jasmine/src/main/config/compile-as-config.xml
index 099956a..9d1c9f9 100644
--- a/jasmine/src/main/config/compile-as-config.xml
+++ b/jasmine/src/main/config/compile-as-config.xml
@@ -31,6 +31,7 @@
         
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
+    <warn-public-vars>false</warn-public-vars>
     
     <include-sources>
         <path-element>generated-sources/externc/classes</path-element>
diff --git a/jquery/build.xml b/jquery/build.xml
index 73cf563..17f5068 100644
--- a/jquery/build.xml
+++ b/jquery/build.xml
@@ -150,9 +150,10 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" fork="true"
+        <java jar="${ROYALE_TRANSPILER_HOME}/lib/compc.jar" fork="true"
             failonerror="true">
             <arg value="+royalelib=externs/frameworks" />
+            <arg value="-targets=SWF" />
             <arg value="-external-library-path+=${basedir}/../js/target/js.swc" />
             <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
             <arg line="-metadata.date=&quot;${royale.swc-date}&quot;" />
diff --git a/jquery/src/main/config/compile-as-config.xml b/jquery/src/main/config/compile-as-config.xml
index 8d711e5..e871119 100644
--- a/jquery/src/main/config/compile-as-config.xml
+++ b/jquery/src/main/config/compile-as-config.xml
@@ -33,6 +33,7 @@
         
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
+    <warn-public-vars>false</warn-public-vars>
     
     <include-sources>
         <path-element>generated-sources/externc/classes</path-element>
diff --git a/js/build.xml b/js/build.xml
index 2d6c1bb..e79d8d9 100644
--- a/js/build.xml
+++ b/js/build.xml
@@ -220,9 +220,10 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
             todir="${basedir}/target" />
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" fork="true"
+        <java jar="${ROYALE_TRANSPILER_HOME}/lib/compc.jar" fork="true"
             failonerror="true">
             <arg value="+royalelib=externs/frameworks" />
+            <arg value="-targets=SWF" />
             <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
             <arg line="-metadata.date=&quot;${royale.swc-date}&quot;" />
             <arg line="-metadata.dateFormat=&quot;MM/dd/yy HH:mm Z&quot;" />
diff --git a/js/src/main/config/compile-as-config.xml b/js/src/main/config/compile-as-config.xml
index 9ea8a8c..cc75ed5 100644
--- a/js/src/main/config/compile-as-config.xml
+++ b/js/src/main/config/compile-as-config.xml
@@ -32,6 +32,7 @@
         
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
+    <warn-public-vars>false</warn-public-vars>
     
     <include-sources>
         <path-element>../src/main/royale</path-element>
diff --git a/node/build.xml b/node/build.xml
index bd47430..8c310d8 100644
--- a/node/build.xml
+++ b/node/build.xml
@@ -231,9 +231,10 @@
     <target name="compc" >
         <copy file="${basedir}/src/main/config/compile-as-config.xml"
         todir="${basedir}/target" />
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" fork="true"
+        <java jar="${ROYALE_TRANSPILER_HOME}/lib/compc.jar" fork="true"
             failonerror="true">
             <arg value="+royalelib=externs/frameworks" />
+            <arg value="-targets=SWF" />
             <arg value="-external-library-path+=${basedir}/../js/target/js.swc" />
             <arg value="-load-config=${basedir}/target/compile-as-config.xml" />
             <arg line="-metadata.date=&quot;${royale.swc-date}&quot;" />
diff --git a/node/src/main/config/compile-as-config.xml b/node/src/main/config/compile-as-config.xml
index 9b5aaf8..92aefff 100644
--- a/node/src/main/config/compile-as-config.xml
+++ b/node/src/main/config/compile-as-config.xml
@@ -34,6 +34,7 @@
         
         <warn-no-constructor>false</warn-no-constructor>
     </compiler>
+    <warn-public-vars>false</warn-public-vars>
     
     <include-sources>
         <path-element>generated-sources/externc/constants</path-element>