You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/11/10 17:40:34 UTC
[01/14] git commit: [flex-falcon] [refs/heads/develop] - - Refactored
the directory structure of the example projects to be maven-style
Repository: flex-falcon
Updated Branches:
refs/heads/develop 29b04417c -> ca49b5d0a
- Refactored the directory structure of the example projects to be maven-style
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7adda959
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7adda959
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7adda959
Branch: refs/heads/develop
Commit: 7adda9597964b1da54861e1541dd62db24abb273
Parents: cccaa5a
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Oct 27 17:14:56 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Oct 27 17:14:56 2016 +0200
----------------------------------------------------------------------
mvnw | 233 +++++++++++++++++++++++++++++++++++++++++++++++++
mvnw.cmd | 145 ++++++++++++++++++++++++++++++
pom.xml | 94 +++++++++-----------
src/site/site.xml | 47 +++++++---
4 files changed, 455 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7adda959/mvnw
----------------------------------------------------------------------
diff --git a/mvnw b/mvnw
new file mode 100755
index 0000000..a1ba1bf
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,233 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ #
+ # Look for the Apple JDKs first to preserve the existing behaviour, and then look
+ # for the new JDKs provided by Oracle.
+ #
+ if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
+ #
+ # Apple JDKs
+ #
+ export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+ fi
+
+ if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
+ #
+ # Apple JDKs
+ #
+ export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ fi
+
+ if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
+ #
+ # Oracle JDKs
+ #
+ export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ fi
+
+ if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
+ #
+ # Apple JDKs
+ #
+ export JAVA_HOME=`/usr/libexec/java_home`
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+ local basedir=$(pwd)
+ local wdir=$(pwd)
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ wdir=$(cd "$wdir/.."; pwd)
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} "$@"
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7adda959/mvnw.cmd
----------------------------------------------------------------------
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 0000000..2b934e8
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,145 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+set MAVEN_CMD_LINE_ARGS=%*
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+
+set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7adda959/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eb0789f..33095bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/asf/flex/site/trunk/content/maven/flexjs/${website.path}</url>
- <!--url>scm:svn:https://svn.apache.org/repos/infra/websites/production/flex/content/maven/flexjs/${website.path}</url-->
+ <url>scm:git:https://git-wip-us.apache.org/repos/asf/flex-falcon.git</url>
</site>
</distributionManagement>
@@ -339,7 +338,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.5.1</version>
+ <!-- Downgraded to 3.4 as 3.5 and 3.5.1 seem to have issues with the velocity tools -->
+ <version>3.4</version>
<configuration>
<generateReports>true</generateReports>
<generateSitemap>true</generateSitemap>
@@ -347,63 +347,30 @@
<locales>en</locales>
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
<outputEncoding>${project.reporting.outputencoding}</outputEncoding>
- <topSiteURL>scm:svn:https://svn.apache.org/repos/asf/flex/site/trunk/content/maven/flexjs/${website.path}</topSiteURL>
- <!--topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/flex/content/maven/flexjs/${website.path}</topSiteURL-->
- <!-- Configure the asciidoctor configuration -->
- <asciidoc>
- <sourceDirectory>src/site/asciidoc</sourceDirectory>
- <requires>
- <require>asciidoctor-diagram</require>
- </requires>
- <backend>html5</backend>
- <attributes>
- <toc>left</toc>
- <toclevels>2</toclevels>
- <icons>font</icons>
- <imagesdir>images</imagesdir>
- <imagesoutdir>${project.build.directory}/site/images</imagesoutdir>
- <sectanchors>true</sectanchors>
- <idprefix />
- <idseparator>-</idseparator>
- <source-highlighter>coderay</source-highlighter>
- <coderay-css>style</coderay-css>
- </attributes>
- </asciidoc>
</configuration>
<dependencies>
<dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>1.7</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
</dependency>
- <!-- All dependencies needed by asciidoctor -->
<dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>1.7.21</version>
- </dependency>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>1.5.4</version>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.6</version>
</dependency>
+ <!-- All dependencies needed by the reflow skin -->
<dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-diagram</artifactId>
- <version>1.3.1</version>
+ <groupId>lt.velykis.maven.skins</groupId>
+ <artifactId>reflow-velocity-tools</artifactId>
+ <version>1.1.1</version>
</dependency>
- <!-- add support for ssh/scp site deployment -->
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>2.10</version>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
</dependency>
- <!-- add support for scm/svn site deployment -->
+ <!-- add support for scm/git site deployment -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-scm</artifactId>
@@ -421,12 +388,37 @@
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svnexe</artifactId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.5</version>
</dependency>
</dependencies>
</plugin>
+ <!--
+ Make the maven-site-plugin stage the output in the "asf-site" branch
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <phase>site-deploy</phase>
+ <!-- deploy site with maven-scm-publish-plugin -->
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ <configuration>
+ <!-- mono-module doesn't require site:stage -->
+ <content>${project.build.directory}/site</content>
+ <!-- branch where to deploy -->
+ <scmBranch>asf-site</scmBranch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7adda959/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 01472a2..76ca728 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,42 +1,64 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
+
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
-->
<project name="Maven" xmlns="https://maven.apache.org/xsd/decoration-1.7.0.xsd">
- <!-- Use the nicer looking fluido skin instead of the default -->
<skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.5</version>
+ <groupId>lt.velykis.maven.skins</groupId>
+ <artifactId>reflow-maven-skin</artifactId>
+ <version>1.1.1</version>
</skin>
+ <!--
+ Details on how to configure the reflow skin:
+ http://andriusvelykis.github.io/reflow-maven-skin/skin/
+ -->
+ <custom>
+ <reflowSkin>
+ <theme>site</theme>
+ <titleTemplate>Apache Flex\ufffd - %2$s</titleTemplate>
+ <breadcrumbs>false</breadcrumbs>
+ <highlightJs>true</highlightJs>
+ </reflowSkin>
+ </custom>
+
<bannerLeft>
<name>Apache Flex</name>
- <src>http://flex.apache.org/images/logo_01_fullcolor-sm.png</src>
+ <src>img/logo-flex.png</src>
<href>http://flex.apache.org/</href>
</bannerLeft>
- <!--bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
- </bannerRight-->
+ <bannerRight>
+ <name>An Apache Project</name>
+ <src>img/logo-asf.png</src>
+ <href>http://www.apache.org</href>
+ </bannerRight>
<body>
+ <head>
+ <link rel="icon" type="image/x-icon" href="img/favicon.ico"/>
+ <link rel="apple-touch-icon" href="img/apple-touch-icon-60.png"/>
+ <link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76.png"/>
+ <link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120.png"/>
+ <link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152.png"/>
+ </head>
+
<links>
<item name="Apache Flex Homepage" href="http://flex.apache.org/" />
<!--item name="Apache FlexJS Homepage" href="http://flex.apache.org/" /-->
@@ -60,6 +82,5 @@
<menu ref="reports" />
<menu ref="parent" />
<menu ref="modules" />
-
</body>
</project>
\ No newline at end of file
[11/14] git commit: [flex-falcon] [refs/heads/develop] - fix zip copy
Posted by ah...@apache.org.
fix zip copy
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d82f28a7
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d82f28a7
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d82f28a7
Branch: refs/heads/develop
Commit: d82f28a771b48984af1402ebec79001eb91d6ded
Parents: e961730
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 9 11:41:45 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 9 11:44:01 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/flex/compiler/clients/COMPJSC.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d82f28a7/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
index bd9a3b1..ac89544 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
@@ -227,9 +227,11 @@ public class COMPJSC extends MXMLJSC
if (!entry.getName().contains("js/out") &&
!entry.getName().contains(SWCReader.CATALOG_XML))
{
+ System.out.println("Copy " + entry.getName());
InputStream input = zipFile.getInputStream(entry);
- zipOutputStream.putNextEntry(entry);
+ zipOutputStream.putNextEntry(new ZipEntry(entry.getName()));
IOUtils.copy(input, zipOutputStream);
+ zipOutputStream.flush();
zipOutputStream.closeEntry();
}
}
@@ -329,7 +331,8 @@ public class COMPJSC extends MXMLJSC
problems.addAll(errors);
zipOutputStream.putNextEntry(new ZipEntry(outputClassFile));
writer.writeTo(zipOutputStream);
- zipOutputStream.closeEntry();
+ zipOutputStream.flush();
+ zipOutputStream.closeEntry();
writer.close();
fileList.append(" <file path=\"" + outputClassFile + "\" mod=\"" + System.currentTimeMillis() + "\"/>\n");
}
@@ -344,7 +347,9 @@ public class COMPJSC extends MXMLJSC
catalog.substring(libraryIndex + 13);
zipOutputStream.putNextEntry(new ZipEntry(SWCReader.CATALOG_XML));
zipOutputStream.write(catalog.getBytes());
- zipOutputStream.closeEntry();
+ zipOutputStream.flush();
+ zipOutputStream.closeEntry();
+ zipOutputStream.flush();
zipOutputStream.close();
swcFile.delete();
File newSWCFile = new File(outputFolderName + ".new");
@@ -355,6 +360,7 @@ public class COMPJSC extends MXMLJSC
}
catch (Exception e)
{
+ System.out.println(e);
final ICompilerProblem problem = new InternalCompilerProblem(e);
problems.add(problem);
}
[06/14] git commit: [flex-falcon] [refs/heads/develop] - - Merged
latest changes from develop - Hopefully fixed an issue if the closure-lib is
specified on the commandline/ant
Posted by ah...@apache.org.
- Merged latest changes from develop
- Hopefully fixed an issue if the closure-lib is specified on the commandline/ant
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/10e23ff6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/10e23ff6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/10e23ff6
Branch: refs/heads/develop
Commit: 10e23ff62fcd086ebc2502709368875cf22bdc26
Parents: dd6e2c1 9f20c16
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Nov 5 09:50:11 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Nov 5 09:50:11 2016 +0100
----------------------------------------------------------------------
Jenkinsfile | 13 +-
compiler-jx/pom.xml | 7 +-
.../apache/flex/compiler/clients/ASDOCJSC.java | 5 -
.../apache/flex/compiler/clients/COMPJSC.java | 5 -
.../apache/flex/compiler/clients/MXMLJSC.java | 51 +-
.../flex/compiler/clients/VF2JSToolGroup.java | 35 -
.../flex/compiler/codegen/as/IASEmitter.java | 3 +
.../codegen/js/vf2js/IJSVF2JSEmitter.java | 30 -
.../internal/codegen/as/ASBlockWalker.java | 2 +-
.../compiler/internal/codegen/as/ASEmitter.java | 6 +
.../internal/codegen/js/JSEmitterTokens.java | 1 +
.../internal/codegen/js/JSPublisher.java | 15 +-
.../codegen/js/flexjs/JSFlexJSDocEmitter.java | 1 -
.../codegen/js/flexjs/JSFlexJSEmitter.java | 64 +
.../codegen/js/goog/JSGoogDocEmitter.java | 1 -
.../codegen/js/goog/JSGoogPublisher.java | 169 +-
.../internal/codegen/js/goog/JarSourceFile.java | 117 ++
.../internal/codegen/js/jsc/JSCPublisher.java | 4 +-
.../codegen/js/jx/BinaryOperatorEmitter.java | 28 +-
.../codegen/js/jx/MemberAccessEmitter.java | 13 +-
.../js/jx/ObjectDefinePropertyEmitter.java | 1 -
.../codegen/js/jx/SuperCallEmitter.java | 68 +-
.../internal/codegen/js/node/NodePublisher.java | 4 +-
.../codegen/js/vf2js/JSVF2JSDocEmitter.java | 270 ---
.../codegen/js/vf2js/JSVF2JSEmitter.java | 1950 ------------------
.../mxml/flexjs/MXMLFlexJSPublisher.java | 698 +++----
.../vf2js/MXMLVF2JSDescriptorSpecifier.java | 337 ---
.../codegen/mxml/vf2js/MXMLVF2JSEmitter.java | 1589 --------------
.../codegen/mxml/vf2js/MXMLVF2JSPublisher.java | 600 ------
.../driver/js/vf2js/JSVF2JSConfiguration.java | 86 -
.../internal/driver/js/vf2js/VF2JSBackend.java | 55 -
.../driver/mxml/vf2js/MXMLVF2JSBackend.java | 132 --
.../driver/mxml/vf2js/MXMLVF2JSSWCBackend.java | 121 --
.../compiler/internal/graph/GoogDepsWriter.java | 19 +-
.../internal/graph/VF2JSDepsWriter.java | 406 ----
.../internal/projects/FlexJSProject.java | 1 -
.../internal/visitor/as/ASNodeSwitch.java | 1 -
.../utils/JSClosureCompilerWrapper.java | 15 +-
.../utils/VF2JSClosureCompilerWrapper.java | 224 --
.../flex/compiler/utils/VF2JSProjectUtils.java | 132 --
.../org.apache.flex.tools.FlexToolGroup | 1 -
.../flexjs/closure-whitelist.properites | 44 +
compiler-jx/src/test/build.xml | 2 -
.../js/flexjs/TestFlexJSAccessorMembers.java | 8 +-
.../codegen/js/flexjs/TestFlexJSClass.java | 6 +-
.../js/flexjs/TestFlexJSExpressions.java | 16 +-
.../codegen/js/vf2js/TestVF2JSClass.java | 401 ----
.../codegen/js/vf2js/TestVF2JSExpressions.java | 124 --
.../codegen/js/vf2js/TestVF2JSFile.java | 92 -
.../codegen/js/vf2js/TestVF2JSProject.java | 131 --
.../codegen/js/vf2js/TestVF2JSStatements.java | 549 -----
.../mxml/flexjs/TestFlexJSMXMLScript.java | 2 +-
.../mxml/vf2js/TestVF2JSMXMLApplication.java | 97 -
.../internal/test/VF2JSMXMLTestBase.java | 219 --
.../compiler/internal/test/VF2JSTestBase.java | 238 ---
.../flexjs/projects/super/Base_result.js | 6 +-
.../src/test/resources/vf2js/files/SimpleAS.as | 43 -
.../resources/vf2js/files/SimpleAS_result.js | 72 -
.../test/resources/vf2js/files/SimpleMXML.mxml | 28 -
.../resources/vf2js/files/SimpleMXML_result.js | 67 -
.../src/test/resources/vf2js/files/Version.as | 25 -
.../resources/vf2js/projects/interfaces/Test.as | 46 -
.../vf2js/projects/interfaces/Test_result.js | 64 -
.../vf2js/projects/interfaces/classes/A.as | 32 -
.../projects/interfaces/classes/A_result.js | 51 -
.../vf2js/projects/interfaces/classes/B.as | 25 -
.../projects/interfaces/classes/B_result.js | 37 -
.../vf2js/projects/interfaces/classes/C.as | 25 -
.../projects/interfaces/classes/C_result.js | 37 -
.../vf2js/projects/interfaces/interfaces/IA.as | 22 -
.../projects/interfaces/interfaces/IA_result.js | 41 -
.../vf2js/projects/interfaces/interfaces/IB.as | 22 -
.../projects/interfaces/interfaces/IB_result.js | 38 -
.../vf2js/projects/interfaces/interfaces/IC.as | 22 -
.../projects/interfaces/interfaces/IC_result.js | 41 -
.../vf2js/projects/interfaces/interfaces/ID.as | 22 -
.../projects/interfaces/interfaces/ID_result.js | 38 -
.../vf2js/projects/interfaces/interfaces/IE.as | 26 -
.../projects/interfaces/interfaces/IE_result.js | 53 -
.../vf2js/projects/sdk/SomeSDKClass.as | 68 -
.../vf2js/projects/sdk/SomeSDKClass_result.js | 114 -
.../vf2js/projects/sdk/bases/HelperBaseClass.as | 33 -
.../sdk/bases/HelperBaseClass_result.js | 46 -
.../simpleMXML/src/SimpleMXML_Project.mxml | 37 -
.../simpleMXML/src/SimpleMXML_Project_result.js | 68 -
.../simpleMXML/src/example/Component.as | 31 -
.../simpleMXML/src/example/Component_result.js | 45 -
.../test/resources/vf2js/projects/super/Base.as | 65 -
.../vf2js/projects/super/Base_result.js | 120 --
.../resources/vf2js/projects/super/Super.as | 54 -
.../vf2js/projects/super/Super_result.js | 89 -
.../clients/problems/ProblemContext.java | 42 +
.../flex/compiler/config/Configuration.java | 5 +
.../compiler/internal/embedding/EmbedData.java | 3 +
.../internal/embedding/EmbedMIMEType.java | 2 +
.../internal/mxml/MXMLTagAttributeData.java | 2 +
.../compiler/internal/mxml/MXMLTagData.java | 4 +
.../compiler/internal/mxml/MXMLTextData.java | 2 +
.../compiler/internal/tree/as/EmbedNode.java | 36 +
.../flex/compiler/problems/CompilerProblem.java | 59 +-
.../src/main/java/flex2/tools/MxmlJSC.java | 4 -
.../resources/config/compile-extern-config.xml | 4 +
102 files changed, 931 insertions(+), 10094 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/10e23ff6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
----------------------------------------------------------------------
diff --cc compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
index 4791887,e2c28d5..00f755e
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
@@@ -271,43 -252,91 +252,91 @@@ public class JSGoogPublisher extends JS
fw.close();
}
+ protected List<SourceFile> getClasspathResources(File jarFile) throws IOException {
+ return getClasspathResources(jarFile, null);
+ }
+
+ protected List<SourceFile> getClasspathResources(File jarFile, Properties whiteList) throws IOException {
+ List<SourceFile> sourceFiles = new LinkedList<SourceFile>();
+
+ JarFile jar = null;
+ try {
+ jar = new JarFile(jarFile);
+ for (Enumeration<JarEntry> jarEntries = jar.entries(); jarEntries.hasMoreElements(); ) {
+ JarEntry jarEntry = jarEntries.nextElement();
+ String fileName = jarEntry.getName();
+ // Add only JS files and if a white-list is specified, only files on that white-list.
+ if (fileName.endsWith(".js") && ((whiteList == null) || (whiteList.containsKey(fileName)))) {
+ // Dump the file.
+ InputStream is = jar.getInputStream(jarEntry);
+ String code = IOUtils.toString(is, "UTF-8");
+ SourceFile sourceFile = new JarSourceFile(jarEntry.getName(), code, false);
+ is.close();
+ sourceFiles.add(sourceFile);
+ }
+ }
+ } finally {
+ if(jar != null) {
+ jar.close();
+ }
+ }
+
+ return sourceFiles;
+ }
+
+ protected List<SourceFile> getDirectoryResources(File directory) throws IOException {
+ List<SourceFile> sourceFiles = new LinkedList<SourceFile>();
+
+ Collection<File> files = FileUtils.listFiles(directory,
+ new RegexFileFilter("^.*(\\.js)"), DirectoryFileFilter.DIRECTORY);
+ for (File file : files)
+ {
+ String relative = directory.toURI().relativize(file.toURI()).getPath();
+ String code = FileUtils.readFileToString(file, "UTF-8");
+ SourceFile sourceFile = new JarSourceFile(relative, code, false);
+ sourceFiles.add(sourceFile);
+ }
+
+ return sourceFiles;
+ }
+
protected void dumpJar(File jarFile, File outputDir) throws IOException
{
- // TODO (mschmalle) for some reason ide thinks this has not been closed
- @SuppressWarnings("resource")
- JarFile jar = new JarFile(jarFile);
+ try {
+ // TODO (mschmalle) for some reason ide thinks this has not been closed
+ @SuppressWarnings("resource")
+ JarFile jar = new JarFile(jarFile);
- for (Enumeration<JarEntry> jarEntries = jar.entries(); jarEntries.hasMoreElements();)
- {
- JarEntry jarEntry = jarEntries.nextElement();
- if (!jarEntry.getName().endsWith("/"))
- {
- File file = new File(outputDir, jarEntry.getName());
-
- // Check if the parent directory exists. If not -> create it.
- File dir = file.getParentFile();
- if (!dir.exists())
- {
- if (!dir.mkdirs())
- {
- throw new IOException("Unable to create directory "
- + dir.getAbsolutePath());
+ for (Enumeration<JarEntry> jarEntries = jar.entries(); jarEntries.hasMoreElements(); ) {
+ JarEntry jarEntry = jarEntries.nextElement();
+ if (!jarEntry.getName().endsWith("/")) {
+ File file = new File(outputDir, jarEntry.getName());
+
+ // Check if the parent directory exists. If not -> create it.
+ File dir = file.getParentFile();
+ if (!dir.exists()) {
+ if (!dir.mkdirs()) {
+ throw new IOException("Unable to create directory "
+ + dir.getAbsolutePath());
+ }
}
- }
- // Dump the file.
- InputStream is = jar.getInputStream(jarEntry);
- FileOutputStream fos = new FileOutputStream(file);
- while (is.available() > 0)
- {
- fos.write(is.read());
+ // Dump the file.
+ InputStream is = jar.getInputStream(jarEntry);
+ FileOutputStream fos = new FileOutputStream(file);
+ while (is.available() > 0) {
+ fos.write(is.read());
+ }
+ fos.close();
+ is.close();
}
- fos.close();
- is.close();
}
- }
- jar.close();
+ jar.close();
+ }catch(Throwable t) {
+ t.printStackTrace();
+ throw new RuntimeException(t);
+ }
}
public class JSGoogErrorManager implements ErrorManager
[10/14] git commit: [flex-falcon] [refs/heads/develop] - this seems
to get rid of ant warnings and not break anything
Posted by ah...@apache.org.
this seems to get rid of ant warnings and not break anything
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e9617301
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e9617301
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e9617301
Branch: refs/heads/develop
Commit: e96173014a23880e1040677f8097b030cf44f2ee
Parents: 3d11fba
Author: Alex Harui <ah...@apache.org>
Authored: Tue Nov 8 12:32:55 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 9 11:44:00 2016 -0800
----------------------------------------------------------------------
.../org/apache/flex/compiler/internal/parsing/as/ASParser.g | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e9617301/compiler/src/main/antlr/org/apache/flex/compiler/internal/parsing/as/ASParser.g
----------------------------------------------------------------------
diff --git a/compiler/src/main/antlr/org/apache/flex/compiler/internal/parsing/as/ASParser.g b/compiler/src/main/antlr/org/apache/flex/compiler/internal/parsing/as/ASParser.g
index 20afd5c..1d7a283 100644
--- a/compiler/src/main/antlr/org/apache/flex/compiler/internal/parsing/as/ASParser.g
+++ b/compiler/src/main/antlr/org/apache/flex/compiler/internal/parsing/as/ASParser.g
@@ -3201,11 +3201,11 @@ argumentList[ContainerNode args]
args.addItem(n);
}
}
- | rpT:TOKEN_PAREN_CLOSE
- { args.endAfter(rpT); enableSemicolonInsertion(); break;}
)*
+ rpT:TOKEN_PAREN_CLOSE
+ { args.endAfter(rpT); enableSemicolonInsertion(); }
;
[14/14] git commit: [flex-falcon] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Posted by ah...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ca49b5d0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ca49b5d0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ca49b5d0
Branch: refs/heads/develop
Commit: ca49b5d0af78bf86310cff4850192b8cf2ad09c6
Parents: e58fe50 29b0441
Author: Alex Harui <ah...@apache.org>
Authored: Thu Nov 10 09:40:14 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Nov 10 09:40:14 2016 -0800
----------------------------------------------------------------------
compiler/src/main/resources/downloads.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[04/14] git commit: [flex-falcon] [refs/heads/develop] - - Added code
to decode url encoded paths returned by "URI"
Posted by ah...@apache.org.
- Added code to decode url encoded paths returned by "URI"
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/35ec1023
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/35ec1023
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/35ec1023
Branch: refs/heads/develop
Commit: 35ec1023a1b094ad8d8c79a0cc4e0e1d25ec36cd
Parents: 36d7ff9
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Oct 28 15:21:27 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Oct 28 15:21:27 2016 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/35ec1023/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index 40a9e1c..adc7e8b 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.URL;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -202,6 +203,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher
// Unless we are not using some insanely complex setup
// the resource will always be on the same machine.
String resourceJarPath = resource.getFile();
+ resourceJarPath = URLDecoder.decode(resourceJarPath, "UTF-8");
if (resourceJarPath.contains(":"))
{
resourceJarPath = resourceJarPath.substring(resourceJarPath.lastIndexOf(":") + 1);
[03/14] git commit: [flex-falcon] [refs/heads/develop] - - Added
debug output to track down the build problems
Posted by ah...@apache.org.
- Added debug output to track down the build problems
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/36d7ff90
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/36d7ff90
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/36d7ff90
Branch: refs/heads/develop
Commit: 36d7ff900d8bac4100718b890a3227bd4ebe5ec8
Parents: f942300
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Oct 28 09:57:34 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Oct 28 09:57:34 2016 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/js/goog/JSGoogPublisher.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/36d7ff90/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
index 4791887..99ef6af 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
@@ -274,6 +274,12 @@ public class JSGoogPublisher extends JSPublisher implements IJSPublisher
protected void dumpJar(File jarFile, File outputDir) throws IOException
{
try {
+ System.out.println("----------------------------------------------------------------");
+ System.out.println("Absolute path: " + jarFile.getAbsolutePath());
+ System.out.println("Canonical path: " + jarFile.getCanonicalPath());
+ System.out.println("Path length: " + jarFile.getCanonicalPath().length());
+ System.out.println("File exists: " + jarFile.exists());
+ System.out.println("----------------------------------------------------------------");
// TODO (mschmalle) for some reason ide thinks this has not been closed
@SuppressWarnings("resource")
JarFile jar = new JarFile(jarFile);
[02/14] git commit: [flex-falcon] [refs/heads/develop] - - Added
temporary code to help track down a build problem.
Posted by ah...@apache.org.
- Added temporary code to help track down a build problem.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f9423008
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f9423008
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f9423008
Branch: refs/heads/develop
Commit: f9423008dbfc5af05ec35b6373641f8436191708
Parents: 7adda95
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Oct 27 17:52:04 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Oct 27 17:52:04 2016 +0200
----------------------------------------------------------------------
.../codegen/js/goog/JSGoogPublisher.java | 60 ++++++++++----------
1 file changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f9423008/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
index ea39e45..4791887 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
@@ -273,41 +273,41 @@ public class JSGoogPublisher extends JSPublisher implements IJSPublisher
protected void dumpJar(File jarFile, File outputDir) throws IOException
{
- // TODO (mschmalle) for some reason ide thinks this has not been closed
- @SuppressWarnings("resource")
- JarFile jar = new JarFile(jarFile);
-
- for (Enumeration<JarEntry> jarEntries = jar.entries(); jarEntries.hasMoreElements();)
- {
- JarEntry jarEntry = jarEntries.nextElement();
- if (!jarEntry.getName().endsWith("/"))
- {
- File file = new File(outputDir, jarEntry.getName());
-
- // Check if the parent directory exists. If not -> create it.
- File dir = file.getParentFile();
- if (!dir.exists())
- {
- if (!dir.mkdirs())
- {
- throw new IOException("Unable to create directory "
- + dir.getAbsolutePath());
+ try {
+ // TODO (mschmalle) for some reason ide thinks this has not been closed
+ @SuppressWarnings("resource")
+ JarFile jar = new JarFile(jarFile);
+
+ for (Enumeration<JarEntry> jarEntries = jar.entries(); jarEntries.hasMoreElements(); ) {
+ JarEntry jarEntry = jarEntries.nextElement();
+ if (!jarEntry.getName().endsWith("/")) {
+ File file = new File(outputDir, jarEntry.getName());
+
+ // Check if the parent directory exists. If not -> create it.
+ File dir = file.getParentFile();
+ if (!dir.exists()) {
+ if (!dir.mkdirs()) {
+ throw new IOException("Unable to create directory "
+ + dir.getAbsolutePath());
+ }
}
- }
- // Dump the file.
- InputStream is = jar.getInputStream(jarEntry);
- FileOutputStream fos = new FileOutputStream(file);
- while (is.available() > 0)
- {
- fos.write(is.read());
+ // Dump the file.
+ InputStream is = jar.getInputStream(jarEntry);
+ FileOutputStream fos = new FileOutputStream(file);
+ while (is.available() > 0) {
+ fos.write(is.read());
+ }
+ fos.close();
+ is.close();
}
- fos.close();
- is.close();
}
- }
- jar.close();
+ jar.close();
+ }catch(Throwable t) {
+ t.printStackTrace();
+ throw new RuntimeException(t);
+ }
}
public class JSGoogErrorManager implements ErrorManager
[13/14] git commit: [flex-falcon] [refs/heads/develop] - Merge branch
'feature-autobuild/example-maven-dirs' into develop
Posted by ah...@apache.org.
Merge branch 'feature-autobuild/example-maven-dirs' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e58fe504
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e58fe504
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e58fe504
Branch: refs/heads/develop
Commit: e58fe50414aa263c205927e7a0f1fa404af75079
Parents: 0d72c8c ecdfde8
Author: Alex Harui <ah...@apache.org>
Authored: Thu Nov 10 08:07:38 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Nov 10 08:07:38 2016 -0800
----------------------------------------------------------------------
.../apache/flex/compiler/clients/COMPJSC.java | 12 +-
.../mxml/flexjs/MXMLFlexJSPublisher.java | 16 +-
mvnw | 233 +++++++++++++++++++
mvnw.cmd | 145 ++++++++++++
pom.xml | 94 ++++----
src/site/site.xml | 46 +++-
6 files changed, 474 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
[12/14] git commit: [flex-falcon] [refs/heads/develop] - fix issue
now that we don't blow away output folders
Posted by ah...@apache.org.
fix issue now that we don't blow away output folders
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ecdfde81
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ecdfde81
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ecdfde81
Branch: refs/heads/develop
Commit: ecdfde81cd8205235c4ebcbd2a41726f0393ea02
Parents: d82f28a
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 9 11:42:08 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 9 11:44:01 2016 -0800
----------------------------------------------------------------------
.../codegen/mxml/flexjs/MXMLFlexJSPublisher.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ecdfde81/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index 90f9d80..d742162 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -117,11 +117,15 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher
outputParentFolder = new File(outputPathParameter);
}
}
- // Default to the output folder being the same directory as the one containing the main class
- // FIXME: This sounds like a bad default ...
else
{
- outputParentFolder = new File(configuration.getTargetFileDirectory()).getParentFile();
+ String mainClassFolder = configuration.getTargetFileDirectory();
+ if (mainClassFolder.endsWith("src"))
+ outputParentFolder = new File(configuration.getTargetFileDirectory()).getParentFile();
+ else if (mainClassFolder.endsWith("src/main/flex"))
+ outputParentFolder = new File(configuration.getTargetFileDirectory()).getParentFile().getParentFile().getParentFile();
+ else
+ outputParentFolder = new File(configuration.getTargetFileDirectory());
}
outputParentFolder = new File(outputParentFolder, FLEXJS_OUTPUT_DIR_NAME);
@@ -167,7 +171,7 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher
// Only create a release directory for release builds.
if (configuration.release()) {
- if (!releaseDir.mkdirs()) {
+ if (!releaseDir.exists() && !releaseDir.mkdirs()) {
throw new IOException("Unable to create release directory at " + releaseDir.getAbsolutePath());
}
}
[05/14] git commit: [flex-falcon] [refs/heads/develop] - - Removed
debug output
Posted by ah...@apache.org.
- Removed debug output
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/dd6e2c11
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/dd6e2c11
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/dd6e2c11
Branch: refs/heads/develop
Commit: dd6e2c1130311a06c62dd25d797831bbbd63117e
Parents: 35ec102
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Oct 28 15:43:04 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Oct 28 15:43:04 2016 +0200
----------------------------------------------------------------------
.../compiler/internal/codegen/js/goog/JSGoogPublisher.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dd6e2c11/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
index 99ef6af..4791887 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
@@ -274,12 +274,6 @@ public class JSGoogPublisher extends JSPublisher implements IJSPublisher
protected void dumpJar(File jarFile, File outputDir) throws IOException
{
try {
- System.out.println("----------------------------------------------------------------");
- System.out.println("Absolute path: " + jarFile.getAbsolutePath());
- System.out.println("Canonical path: " + jarFile.getCanonicalPath());
- System.out.println("Path length: " + jarFile.getCanonicalPath().length());
- System.out.println("File exists: " + jarFile.exists());
- System.out.println("----------------------------------------------------------------");
// TODO (mschmalle) for some reason ide thinks this has not been closed
@SuppressWarnings("resource")
JarFile jar = new JarFile(jarFile);
[07/14] git commit: [flex-falcon] [refs/heads/develop] - - Merged
stuff that seems to have been lost in previous merges - Removed the clearing
of the debug-js and release-js directories - Fixed issues with the cordova
build
Posted by ah...@apache.org.
- Merged stuff that seems to have been lost in previous merges
- Removed the clearing of the debug-js and release-js directories
- Fixed issues with the cordova build
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/015dfb0f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/015dfb0f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/015dfb0f
Branch: refs/heads/develop
Commit: 015dfb0f125ab6e331646695388bbe141f83ae69
Parents: 10e23ff
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Nov 8 16:10:44 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Nov 8 16:10:44 2016 +0100
----------------------------------------------------------------------
.../apache/flex/compiler/clients/COMPJSC.java | 2 +
.../internal/codegen/js/JSPublisher.java | 4 --
.../codegen/js/goog/JSGoogPublisher.java | 58 ++++++++++----------
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 10 +++-
.../mxml/flexjs/MXMLFlexJSPublisher.java | 4 +-
.../internal/projects/FlexJSProject.java | 2 +-
src/site/site.xml | 1 +
7 files changed, 44 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/015dfb0f/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
index 594ff45..312f868 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
@@ -273,6 +273,8 @@ public class COMPJSC extends MXMLJSC
String symbol = cu.getQualifiedNames().get(0);
if (externs.contains(symbol)) continue;
+ if (project.isExternalLinkage(cu)) continue;
+
if (!packingSWC)
{
final File outputClassFile = getOutputClassFile(
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/015dfb0f/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java
index eaa8fe8..17d0912 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/JSPublisher.java
@@ -58,10 +58,6 @@ public class JSPublisher implements IJSPublisher
protected void setupOutputFolder()
{
- if (outputParentFolder.exists()) {
- FileUtils.deleteQuietly(outputParentFolder);
- }
-
if (!outputFolder.exists()) {
outputFolder.mkdirs();
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/015dfb0f/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
index 00f755e..e2c28d5 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogPublisher.java
@@ -302,41 +302,41 @@ public class JSGoogPublisher extends JSPublisher implements IJSPublisher
protected void dumpJar(File jarFile, File outputDir) throws IOException
{
- try {
- // TODO (mschmalle) for some reason ide thinks this has not been closed
- @SuppressWarnings("resource")
- JarFile jar = new JarFile(jarFile);
+ // TODO (mschmalle) for some reason ide thinks this has not been closed
+ @SuppressWarnings("resource")
+ JarFile jar = new JarFile(jarFile);
- for (Enumeration<JarEntry> jarEntries = jar.entries(); jarEntries.hasMoreElements(); ) {
- JarEntry jarEntry = jarEntries.nextElement();
- if (!jarEntry.getName().endsWith("/")) {
- File file = new File(outputDir, jarEntry.getName());
-
- // Check if the parent directory exists. If not -> create it.
- File dir = file.getParentFile();
- if (!dir.exists()) {
- if (!dir.mkdirs()) {
- throw new IOException("Unable to create directory "
- + dir.getAbsolutePath());
- }
+ for (Enumeration<JarEntry> jarEntries = jar.entries(); jarEntries.hasMoreElements();)
+ {
+ JarEntry jarEntry = jarEntries.nextElement();
+ if (!jarEntry.getName().endsWith("/"))
+ {
+ File file = new File(outputDir, jarEntry.getName());
+
+ // Check if the parent directory exists. If not -> create it.
+ File dir = file.getParentFile();
+ if (!dir.exists())
+ {
+ if (!dir.mkdirs())
+ {
+ throw new IOException("Unable to create directory "
+ + dir.getAbsolutePath());
}
+ }
- // Dump the file.
- InputStream is = jar.getInputStream(jarEntry);
- FileOutputStream fos = new FileOutputStream(file);
- while (is.available() > 0) {
- fos.write(is.read());
- }
- fos.close();
- is.close();
+ // Dump the file.
+ InputStream is = jar.getInputStream(jarEntry);
+ FileOutputStream fos = new FileOutputStream(file);
+ while (is.available() > 0)
+ {
+ fos.write(is.read());
}
+ fos.close();
+ is.close();
}
-
- jar.close();
- }catch(Throwable t) {
- t.printStackTrace();
- throw new RuntimeException(t);
}
+
+ jar.close();
}
public class JSGoogErrorManager implements ErrorManager
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/015dfb0f/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 1f30509..3379dec 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -180,12 +180,20 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
}
else if (sawRequires)
{
+ // append info() structure if main CU
+ ICompilerProject project = getMXMLWalker().getProject();
+ FlexJSProject flexJSProject = null;
+ if (project instanceof FlexJSProject)
+ flexJSProject = (FlexJSProject) project;
+
stillSearching = false;
for (String usedName :usedNames) {
if (!foundRequires.contains(usedName)) {
if (usedName.equals(classDefinition.getQualifiedName())) continue;
if (((JSFlexJSEmitter) asEmitter).getModel().isInternalClass(usedName)) continue;
if (subDocumentNames.contains(usedName)) continue;
+ if (flexJSProject != null && flexJSProject.isExternalLinkage(flexJSProject.resolveQNameToCompilationUnit(usedName)))
+ continue;
namesToAdd.add(usedName);
}
}
@@ -1377,7 +1385,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
indentPush();
writeNewline("{");
writeNewline("/** @type {Array} */");
- writeNewline("var arr = org.apache.flex.utils.Language.superGetter(" + formatQualifiedName(cname) + ",this, 'MXMLDescriptor');");
+ writeNewline("var arr = " + formatQualifiedName(cname) + ".superClass_.get__MXMLDescriptor.apply(this);");
writeNewline("/** @type {Array} */");
indentPop();
indentPop();
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/015dfb0f/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index aecc180..90f9d80 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -161,9 +161,9 @@ public class MXMLFlexJSPublisher extends JSGoogPublisher implements IJSPublisher
if (!isMarmotinniRun)
{
// If there is a release dir, we delete it in any case.
- if (releaseDir.exists()) {
+ /*if (releaseDir.exists()) {
FileUtils.deleteQuietly(releaseDir);
- }
+ }*/
// Only create a release directory for release builds.
if (configuration.release()) {
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/015dfb0f/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
index 818355c..10f89ea 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
@@ -196,7 +196,7 @@ public class FlexJSProject extends FlexProject
return null;
}
- private boolean isExternalLinkage(ICompilationUnit cu)
+ public boolean isExternalLinkage(ICompilationUnit cu)
{
if (linkageChecker == null)
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/015dfb0f/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 76ca728..894cdfc 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,6 +19,7 @@
-->
<project name="Maven" xmlns="https://maven.apache.org/xsd/decoration-1.7.0.xsd">
+ <!-- Use the nicer looking fluido skin instead of the default -->
<skin>
<groupId>lt.velykis.maven.skins</groupId>
<artifactId>reflow-maven-skin</artifactId>
[08/14] git commit: [flex-falcon] [refs/heads/develop] - fix
MapSearch example
Posted by ah...@apache.org.
fix MapSearch example
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c5e73c73
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c5e73c73
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c5e73c73
Branch: refs/heads/develop
Commit: c5e73c73b6cbdfa25d9daa48f6f48c6197bdd121
Parents: 015dfb0
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 7 14:11:19 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 9 11:44:00 2016 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/flex/compiler/clients/COMPJSC.java | 2 +-
.../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c5e73c73/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
index 312f868..bd9a3b1 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java
@@ -274,7 +274,7 @@ public class COMPJSC extends MXMLJSC
if (externs.contains(symbol)) continue;
if (project.isExternalLinkage(cu)) continue;
-
+
if (!packingSWC)
{
final File outputClassFile = getOutputClassFile(
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c5e73c73/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 3379dec..f951b4d 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -185,7 +185,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
FlexJSProject flexJSProject = null;
if (project instanceof FlexJSProject)
flexJSProject = (FlexJSProject) project;
-
+
stillSearching = false;
for (String usedName :usedNames) {
if (!foundRequires.contains(usedName)) {
[09/14] git commit: [flex-falcon] [refs/heads/develop] - fix build
Posted by ah...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3d11fba9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3d11fba9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3d11fba9
Branch: refs/heads/develop
Commit: 3d11fba9514b978c696ebc7d292cc32f7f5db280
Parents: c5e73c7
Author: Alex Harui <ah...@apache.org>
Authored: Tue Nov 8 12:32:31 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 9 11:44:00 2016 -0800
----------------------------------------------------------------------
.../src/test/resources/flexjs/files/MyInitialView_result.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3d11fba9/compiler-jx/src/test/resources/flexjs/files/MyInitialView_result.js
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/resources/flexjs/files/MyInitialView_result.js b/compiler-jx/src/test/resources/flexjs/files/MyInitialView_result.js
index c0bfc75..1bc0837 100644
--- a/compiler-jx/src/test/resources/flexjs/files/MyInitialView_result.js
+++ b/compiler-jx/src/test/resources/flexjs/files/MyInitialView_result.js
@@ -453,7 +453,7 @@ Object.defineProperties(MyInitialView.prototype, /** @lends {MyInitialView.proto
if (this.mxmldd == undefined)
{
/** @type {Array} */
- var arr = org.apache.flex.utils.Language.superGetter(MyInitialView,this, 'MXMLDescriptor');
+ var arr = MyInitialView.superClass_.get__MXMLDescriptor.apply(this);
/** @type {Array} */
var data = [
org.apache.flex.html.Label,