Yep. Good point. That's weird cause I see changes when I'm clicking on hash in github [1], but I don't see it straight in develop branch [2]
[1] https://github.com/apache/royale-compiler/tree/6e74505a4efdc03469cdef7ed3477fc6a804a322 [2] https://github.com/apache/royale-compiler/commits/develop Piotr 2017-09-28 10:59 GMT+02:00 Harbs <[email protected]>: > Something is odd here. > > I don’t see these changes in the origin. > > Is it possible something is not setup correctly? > > > On Sep 28, 2017, at 1:05 AM, [email protected] wrote: > > > > This is an automated email from the ASF dual-hosted git repository. > > > > aharui pushed a commit to branch develop > > in repository https://gitbox.apache.org/repos/asf/royale-compiler.git > > > > commit 6e74505a4efdc03469cdef7ed3477fc6a804a322 > > Author: Alex Harui <[email protected]> > > AuthorDate: Wed Sep 27 15:05:43 2017 -0700 > > > > got 'ant all' to work > > --- > > build.xml | 20 > +++++++++--------- > > .../codegen/externals/ExternalsTestUtils.java | 24 > +++++++++++----------- > > .../java/org/apache/flex/utils/EnvProperties.java | 2 +- > > 3 files changed, 23 insertions(+), 23 deletions(-) > > > > diff --git a/build.xml b/build.xml > > index 231f152..3f39b8b 100644 > > --- a/build.xml > > +++ b/build.xml > > @@ -42,15 +42,15 @@ > > property="FLEXJS_TYPEDEFS_HOME" > > value="${env.FLEXJS_TYPEDEFS_HOME}" /> > > > > - <available file="${basedir}/../flex-typedefs" > > + <available file="${basedir}/../royale-typedefs" > > type="dir" > > property="FLEXJS_TYPEDEFS_HOME" > > - value="${basedir}/../flex-typedefs" /> > > + value="${basedir}/../royale-typedefs" /> > > > > - <available file="${basedir}/flex-typedefs" > > + <available file="${basedir}/royale-typedefs" > > type="dir" > > property="FLEXJS_TYPEDEFS_HOME" > > - value="${basedir}/flex-typedefs" /> > > + value="${basedir}/royale-typedefs" /> > > > > <fail message="The environment variable FLEXJS_TYPEDEFS_HOME is > not set to a directory" > > unless="FLEXJS_TYPEDEFS_HOME"/> > > @@ -478,7 +478,7 @@ > > </target> > > > > <target name="stage-typedefs" depends="check-typedefs-home"> > > - <copy todir="${basedir}/temp/flex-typedefs" > includeEmptyDirs="false"> > > + <copy todir="${basedir}/temp/royale-typedefs" > includeEmptyDirs="false"> > > <fileset dir="${FLEXJS_TYPEDEFS_HOME}"> > > <include name="**"/> > > <exclude name="**/target/**" /> > > @@ -594,7 +594,7 @@ > > > > <antcall target="stage-source-jx" /> > > > > - <copy todir="${basedir}/temp/flex-typedefs" > includeEmptyDirs="false"> > > + <copy todir="${basedir}/temp/royale-typedefs" > includeEmptyDirs="false"> > > <fileset dir="${FLEXJS_TYPEDEFS_HOME}"> > > <include > > name="createjs/target/downloads/EaselJS-0.8.0/LICENSE.txt" > /> > > <include > > name="createjs/target/downloads/TweenJS-0.6.2/LICENSE.txt" > /> > > @@ -634,8 +634,8 @@ > > <copy tofile="${basedir}/temp/js/libs/node.swc" > file="${FLEXJS_TYPEDEFS_HOME}/node/target/node.swc" /> > > > > <!-- generated --> > > - <mkdir dir="${basedir}/temp/flex-typedefs"/> > > - <copy todir="${basedir}/temp/flex-typedefs" > includeEmptyDirs="false"> > > + <mkdir dir="${basedir}/temp/royale-typedefs"/> > > + <copy todir="${basedir}/temp/royale-typedefs" > includeEmptyDirs="false"> > > <fileset dir="${FLEXJS_TYPEDEFS_HOME}"> > > <include name="**/**"/> > > <exclude name="**/externs.zip" /> > > @@ -647,7 +647,7 @@ > > </fileset> > > </copy> > > <echo>copy easel and tween</echo> > > - <copy todir="${basedir}/temp/flex-typedefs" > includeEmptyDirs="false"> > > + <copy todir="${basedir}/temp/royale-typedefs" > includeEmptyDirs="false"> > > <fileset dir="${FLEXJS_TYPEDEFS_HOME}"> > > <include name="createjs/target/ > downloads/Easel*/src/**"/> > > <include name="createjs/target/ > downloads/Tween*/src/**"/> > > @@ -754,7 +754,7 @@ > > <exclude name="**/*.flv"/> > > <exclude name="**/org.apache.flex.tools.FlexToolGroup"/> > > <exclude name="debugger/META-INF/MANIFEST.MF"/> > > - <exclude name="flex-typedefs/target/ > maven-shared-archive-resources/META-INF/DEPENDENCIES"/> > > + <exclude name="royale-typedefs/target/ > maven-shared-archive-resources/META-INF/DEPENDENCIES"/> > > <exclude name="**/*.patch"/> > > <exclude name="LICENSE.jx.bin"/> > > <exclude name="README_JX"/> > > diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/ > internal/codegen/externals/ExternalsTestUtils.java > b/compiler-jx/src/test/java/org/apache/flex/compiler/ > internal/codegen/externals/ExternalsTestUtils.java > > index d9cc4f3..12c31bf 100644 > > --- a/compiler-jx/src/test/java/org/apache/flex/compiler/ > internal/codegen/externals/ExternalsTestUtils.java > > +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/ > internal/codegen/externals/ExternalsTestUtils.java > > @@ -50,48 +50,48 @@ public class ExternalsTestUtils > > public static void init() > > { > > File f = new File( > > - "../../../flex-typedefs/js/src/main/javascript/missing.js"); > > + "../../../royale-typedefs/js/src/main/javascript/missing.js"); > > if (!f.exists()) > > f = new File( > > - "../../../../flex-typedefs/js/src/main/javascript/missing. > js"); > > + "../../../../royale-typedefs/js/src/main/javascript/ > missing.js"); > > // XXX missing.js is a temp location until we can figure out > where it should placed in the build > > MISSING_JS_FILE = FilenameNormalization.normalize(f); > > > > f = new File( > > - "../../../flex-typedefs/js/src/main/flex/AS3.as"); > > + "../../../royale-typedefs/js/src/main/flex/AS3.as"); > > if (!f.exists()) > > f = new File( > > - "../../../../flex-typedefs/js/src/main/flex/AS3.as"); > > + "../../../../royale-typedefs/js/src/main/flex/AS3.as"); > > // XXX AS3.as is a namespace needed to override toString in some > classes > > AS3_NAMESPACE_FILE = FilenameNormalization.normalize(f); > > > > f = new File( > > - "../../../flex-typedefs/js/target/downloads"); > > + "../../../royale-typedefs/js/target/downloads"); > > if (!f.exists()) > > f = new File( > > - "../../../../flex-typedefs/js/target/downloads"); > > + "../../../../royale-typedefs/js/target/downloads"); > > EXTERNAL_JS_DIR = FilenameNormalization.normalize(f); > > > > f = new File( > > - "../../../flex-typedefs/jquery/target/downloads"); > > + "../../../royale-typedefs/jquery/target/downloads"); > > if (!f.exists()) > > f = new File( > > - "../../../../flex-typedefs/jquery/target/downloads"); > > + "../../../../royale-typedefs/jquery/target/downloads"); > > > > EXTERNAL_JQUERY_DIR = FilenameNormalization.normalize(f); > > > > f = new File( > > - "../../../flex-typedefs/jasmine/target/downloads"); > > + "../../../royale-typedefs/jasmine/target/downloads"); > > if (!f.exists()) > > f = new File( > > - "../../../../flex-typedefs/ > jasmine/target/downloads"); > > + "../../../../royale-typedefs/ > jasmine/target/downloads"); > > EXTERNAL_JASMINE_DIR = FilenameNormalization.normalize(f); > > > > f = new File( > > - "../../../flex-typedefs/node/target/downloads/closure- > compiler-master/contrib/nodejs"); > > + "../../../royale-typedefs/node/target/downloads/closure- > compiler-master/contrib/nodejs"); > > if (!f.exists()) > > f = new File( > > - "../../../../flex-typedefs/node/target/downloads/closure- > compiler-master/contrib/nodejs"); > > + "../../../../royale-typedefs/node/target/downloads/closure- > compiler-master/contrib/nodejs"); > > EXTERNAL_NODE_DIR = FilenameNormalization.normalize(f); > > > > } > > diff --git > > a/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java > b/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java > > index a481a6e..210468a 100644 > > --- a/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java > > +++ b/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java > > @@ -146,7 +146,7 @@ public class EnvProperties { > > > > ASJS = p.getProperty(prefix + "ASJS_HOME", > System.getenv("ASJS_HOME")); > > if (ASJS == null) > > - ASJS = FilenameNormalization.normalize("../../../../flex- > asjs"); > > + ASJS = FilenameNormalization.normalize("../../../../royale- > asjs"); > > System.out.println("environment property - ASJS_HOME = " + > ASJS); > > > > GOOG = p.getProperty(prefix + "GOOG_HOME", > System.getenv("GOOG_HOME")); > > > > -- > > To stop receiving notification emails like this one, please contact > > "[email protected]" <[email protected]>. > > -- Piotr Zarzycki mobile: +48 880 859 557 skype: zarzycki10 LinkedIn: http://www.linkedin.com/piotrzarzycki <https://pl.linkedin.com/in/piotr-zarzycki-92a53552> GitHub: https://github.com/piotrzarzycki21
