flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [49/50] [abbrv] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'release4.16.0' into develop
Date Wed, 15 Mar 2017 04:05:18 GMT
Merge branch 'release4.16.0' into develop

Conflicts:
	installer.xml


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a616e558
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a616e558
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a616e558

Branch: refs/heads/develop
Commit: a616e55899d8e58db4886c00f681cee2fe8945ed
Parents: a5b04e1 14c9664
Author: Justin Mclean <jmclean@apache.org>
Authored: Wed Mar 15 15:03:47 2017 +1100
Committer: Justin Mclean <jmclean@apache.org>
Committed: Wed Mar 15 15:03:47 2017 +1100

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 ApproveSDK.xml                                  |  21 +-
 CONTRIBUTORS                                    |   3 +
 NOTICE                                          |   2 +-
 README                                          |   9 +-
 RELEASE_NOTES                                   |  90 ++++-
 build.xml                                       |   4 +-
 frameworks/build.xml                            |  12 +
 frameworks/downloads.xml                        |  21 +-
 .../mx/controls/listClasses/AdvancedListBase.as |   5 +-
 .../assets/fonts/awesome/FontAwesome.otf        | Bin 109688 -> 134808 bytes
 .../src/flatspark/utils/AwesomeUtils.as         | 122 ++++++-
 .../framework/src/mx/utils/ObjectUtil.as        |   2 +-
 .../src/mx/validators/EmailValidator.as         |   2 +-
 .../src/spark/skins/ios7/BusyIndicatorSkin.as   |  20 +-
 .../spark/src/spark/components/DropDownList.as  |  12 +-
 .../src/spark/skins/spark/BusyIndicatorSkin.as  |  21 +-
 ide/addAIRtoSDK.sh                              |  59 +++-
 ide/checkAllPlayerGlobals.sh                    |  50 +--
 ide/flashbuilder/config/air-config.xml          |  21 +-
 ide/flashbuilder/config/flex-config.xml         |  20 +-
 ide/setFlashPlayerVersion.sh                    |  79 ++++-
 installer.xml                                   |  28 +-
 licenseParts/NOTICE.asc                         |   2 +-
 licenseParts/NOTICE.base                        |   2 +-
 licenseParts/NOTICE.pb                          |   2 +-
 licenseParts/saxon9-NOTICES/APACHE-ANT.txt      |  13 +
 licenseParts/saxon9-NOTICES/APACHE-RESOLVER.txt |   9 +
 licenseParts/saxon9-NOTICES/APACHE-XERCES.txt   |  17 +
 licenseParts/saxon9-NOTICES/CERN.txt            |   7 +
 licenseParts/saxon9-NOTICES/FRIJTERS.txt        |  22 ++
 licenseParts/saxon9-NOTICES/GPL+CLASSPATH.txt   | 347 +++++++++++++++++++
 licenseParts/saxon9-NOTICES/JAMESCLARK.txt      |  25 ++
 licenseParts/saxon9-NOTICES/LEGAL.txt           |  33 ++
 licenseParts/saxon9-NOTICES/LICENSE.txt         |  15 +
 licenseParts/saxon9-NOTICES/THAI.txt            |  31 ++
 licenseParts/saxon9-NOTICES/UNICODE.txt         |  29 ++
 .../src/java/macromedia/asc/embedding/Main.java |   2 +-
 .../java/macromedia/asc/embedding/Shell.java    |   2 +-
 .../java/macromedia/asc/embedding/SwfMaker.java |  16 +-
 .../flex2/compiler/common/Configuration.java    |  32 ++
 .../java/flex2/linker/LinkerConfiguration.java  |   4 +
 .../src/java/flex2/linker/SimpleMovie.java      |  10 +
 .../src/java/flex2/tools/ASDoc_da.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_de.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_en.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_es.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_fi.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_fr.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_it.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_ja.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_ko.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_nb.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_nl.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_pt.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_ru.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_sv.properties    |   2 +-
 .../src/java/flex2/tools/ASDoc_zh_CN.properties |   2 +-
 .../src/java/flex2/tools/ASDoc_zh_TW.properties |   2 +-
 .../src/java/flex2/tools/Compc_da.properties    |   2 +-
 .../src/java/flex2/tools/Compc_de.properties    |   2 +-
 .../src/java/flex2/tools/Compc_en.properties    |   2 +-
 .../src/java/flex2/tools/Compc_es.properties    |   2 +-
 .../src/java/flex2/tools/Compc_fi.properties    |   2 +-
 .../src/java/flex2/tools/Compc_fr.properties    |   2 +-
 .../src/java/flex2/tools/Compc_it.properties    |   2 +-
 .../src/java/flex2/tools/Compc_ja.properties    |   2 +-
 .../src/java/flex2/tools/Compc_ko.properties    |   2 +-
 .../src/java/flex2/tools/Compc_nb.properties    |   2 +-
 .../src/java/flex2/tools/Compc_nl.properties    |   2 +-
 .../src/java/flex2/tools/Compc_pt.properties    |   2 +-
 .../src/java/flex2/tools/Compc_ru.properties    |   2 +-
 .../src/java/flex2/tools/Compc_sv.properties    |   2 +-
 .../src/java/flex2/tools/Compc_zh_CN.properties |   2 +-
 .../src/java/flex2/tools/Compc_zh_TW.properties |   2 +-
 .../java/flex2/tools/DigestTool_da.properties   |   2 +-
 .../java/flex2/tools/DigestTool_de.properties   |   2 +-
 .../java/flex2/tools/DigestTool_en.properties   |   2 +-
 .../java/flex2/tools/DigestTool_es.properties   |   2 +-
 .../java/flex2/tools/DigestTool_fi.properties   |   2 +-
 .../java/flex2/tools/DigestTool_fr.properties   |   2 +-
 .../java/flex2/tools/DigestTool_it.properties   |   2 +-
 .../java/flex2/tools/DigestTool_ja.properties   |   2 +-
 .../java/flex2/tools/DigestTool_ko.properties   |   2 +-
 .../java/flex2/tools/DigestTool_nb.properties   |   2 +-
 .../java/flex2/tools/DigestTool_nl.properties   |   2 +-
 .../java/flex2/tools/DigestTool_pt.properties   |   2 +-
 .../java/flex2/tools/DigestTool_ru.properties   |   2 +-
 .../java/flex2/tools/DigestTool_sv.properties   |   2 +-
 .../flex2/tools/DigestTool_zh_CN.properties     |   2 +-
 .../flex2/tools/DigestTool_zh_TW.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_da.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_de.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_en.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_es.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_fi.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_fr.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_it.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_ja.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_ko.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_nb.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_nl.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_pt.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_ru.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_sv.properties     |   2 +-
 .../src/java/flex2/tools/Fcsh_zh_CN.properties  |   2 +-
 .../src/java/flex2/tools/Fcsh_zh_TW.properties  |   2 +-
 .../src/java/flex2/tools/Mxmlc_da.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_de.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_en.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_es.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_fi.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_fr.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_it.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_ja.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_ko.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_nb.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_nl.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_pt.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_ru.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_sv.properties    |   2 +-
 .../src/java/flex2/tools/Mxmlc_zh_CN.properties |   2 +-
 .../src/java/flex2/tools/Mxmlc_zh_TW.properties |   2 +-
 .../tools/flexbuilder/BuilderConfiguration.java |  10 +
 .../src/java/flex2/tools/oem/Application.java   |   2 +-
 .../src/java/flex2/tools/oem/Configuration.java |  44 ++-
 .../src/java/flex2/tools/oem/Library.java       |   2 +-
 .../src/java/flex2/tools/oem/Toolkit.java       |   4 +-
 .../oem/internal/ConfigurationConstants.java    |   2 +
 .../tools/oem/internal/LinkerConfiguration.java |  24 ++
 .../tools/oem/internal/OEMConfiguration.java    |  30 ++
 .../flex/tools/debugger/cli/fdb_da.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_de.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_en.properties   |   4 +-
 .../flex/tools/debugger/cli/fdb_es.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_fi.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_fr.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_it.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_ja.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_ko.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_nb.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_nl.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_pt.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_ru.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_sv.properties   |   2 +-
 .../tools/debugger/cli/fdb_zh_CN.properties     |   2 +-
 .../tools/debugger/cli/fdb_zh_TW.properties     |   2 +-
 modules/downloads.xml                           |  25 +-
 .../swfutils/src/java/flash/swf/TagDecoder.java |   7 +-
 .../swfutils/src/java/flash/swf/TagEncoder.java |   4 +-
 .../src/java/flash/swf/tags/FileAttributes.java |   4 +
 .../src/java/flash/swf/tools/SwfxParser.java    |   2 +
 .../src/java/flash/swf/tools/SwfxPrinter.java   |   2 +
 .../velocity/test/texen/additional.props        |   1 -
 .../velocity/test/texen/compare/Test.txt        |  11 -
 .../test/texen/compare/TurbineWeather.java      |  81 -----
 .../texen/compare/TurbineWeatherService.java    |  78 -----
 .../test/texen/compare/WeatherService.java      |  70 ----
 .../velocity/test/texen/compare/book.txt        |  15 -
 .../thirdparty/velocity/test/texen/license.txt  |  55 ---
 .../velocity/test/texen/service.props           |  21 --
 .../velocity/test/texen/templates/Control.vm    |  41 ---
 .../texen/templates/ServiceImplementation.vm    |  39 ---
 .../test/texen/templates/ServiceInterface.vm    |  31 --
 .../test/texen/templates/ServiceStaticHelper.vm |  42 ---
 .../velocity/test/texen/templates/Test.vm       |  27 --
 .../velocity/test/texen/templates/book.vm       |  31 --
 .../velocity/test/texen/templates/test.props    |   4 -
 templates/swfobject/history/history.js          |  23 +-
 169 files changed, 1320 insertions(+), 830 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a616e558/installer.xml
----------------------------------------------------------------------
diff --cc installer.xml
index f86ecec,5996861..38ace4f
--- a/installer.xml
+++ b/installer.xml
@@@ -419,7 -419,7 +419,11 @@@
      	<echo message="Should unzip: ${shouldUnzip}"/>
      </target>
  
++<<<<<<< HEAD
 +    <target name="unzipAIRSDK" if="${shouldUnzip}" depends="unzipOrMountDMG">
++=======
+     <target name="unzipAIRSDK" if="${shouldUnzip}">
++>>>>>>> release4.16.0
      	<echo message="Unzipping"/>
  
      	<!--The tbz2 contains symlinks which Ant does not preserve
@@@ -439,15 -439,16 +443,27 @@@
          <delete file="${basedir}/airtar.properties" />
      </target>
      
++<<<<<<< HEAD
 +	<target name="mountAIRSDK" unless="${shouldUnzip}" depends="unzipOrMountDMG">
 +		<echo message="Mounting dmg"/>
 +		<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
 +	      <arg value="attach"/>
++=======
+ 	<target name="mountAIRSDK" unless="${shouldUnzip}">
+ 		<echo message="Mounting dmg"/>
+ 		<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
+ 	      <arg value="attach"/>
+ 	      <arg value="-nobrowse"/>
++>>>>>>> release4.16.0
  	      <arg value="${download.dir}/airsdk/${air.sdk.url.file}"/>
  	    </exec>
  	</target>
  
++<<<<<<< HEAD
 +	<target name="copyFromMount" unless="${shouldUnzip}" depends="mountAIRSDK">
++=======
+ 	<target name="copyFromMount" unless="${shouldUnzip}">
++>>>>>>> release4.16.0
  		<echo message="Copying AIR SDK from mounted volume"/>
  		<exec executable="rsync" dir="${FLEX_HOME}">
              <arg value="--archive" />
@@@ -458,7 -459,7 +474,11 @@@
          </exec>
  	</target>
  
++<<<<<<< HEAD
 +	<target name="unmountAIRSDK" unless="${shouldUnzip}" depends="copyFromMount">
++=======
+ 	<target name="unmountAIRSDK" unless="${shouldUnzip}">
++>>>>>>> release4.16.0
  		<echo message="Unmounting AIR SDK"/>
  		<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="false">
  	      <arg value="unmount"/>
@@@ -466,7 -467,7 +486,11 @@@
  	    </exec>
  	</target>
      
++<<<<<<< HEAD
 +    <target name="air-setup-mac" depends="unzipAIRSDK,mountAIRSDK,copyFromMount,unmountAIRSDK"
unless="isWindows">
++=======
+     <target name="air-setup-mac" depends="unzipOrMountDMG,unzipAIRSDK,mountAIRSDK,copyFromMount,unmountAIRSDK"
unless="isWindows">
++>>>>>>> release4.16.0
          <antcall target="mac-copy-file">
              <param name="srcdir" value="." />
              <param name="filename" value="AIR SDK license.pdf"/>


Mime
View raw message