0 Replies Latest reply on May 9, 2008 7:49 PM by (Jono_Spiro)

    [svn] 1661: Merge from trunk to 30x: multiple target player support

      Revision: 1661
      Author: jspiro@adobe.com
      Date: 2008-05-09 20:49:18 -0700 (Fri, 09 May 2008)

      Log Message:
      -----------
      Merge from trunk to 30x: multiple target player support
      * Block this change from being merged back into trunk!
      * Block merging down to 30x from trunk revisions 1623 1448 1342 1307 1274 793
      (small one-liners for asc compatibility came from other changelists, we'll just deal with those conflicts when they come)
      * Committing a downgraded asc.jar from TRUNK revision 1625 so the build doesn't break.
      * Jim will merge the sources of modules/asc@1625 later -- a full clobber except for ASC's build.xml

      Reviewer: changes were reviewed in the revisions they were merged from; Gaurav and Rob ran the full QA suite
      Bugs: n/a
      QA: Yes -- Kristen: we should retest the -target-player functionality was merged correctly (you'll need to grab a fresh playerglobal.swc)
      Doc: 301 docs should be updated for this new functionality (email me for info)

      Modified Paths:
      --------------
      flex/sdk/branches/3.0.x/build.xml
      flex/sdk/branches/3.0.x/frameworks/air-config.xml
      flex/sdk/branches/3.0.x/frameworks/build_framework.xml
      flex/sdk/branches/3.0.x/frameworks/flex-config.xml
      flex/sdk/branches/3.0.x/frameworks/projects/airframework/bundles/en_US/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/airframework/bundles/ja_JP/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/flash-integration/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/flex/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/framework/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/framework/bundles/en_US/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/framework/bundles/ja_JP/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/haloclassic/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/rpc/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/rpc/bundles/en_US/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/rpc/bundles/ja_JP/build.properties
      flex/sdk/branches/3.0.x/frameworks/projects/utilities/build.properties
      flex/sdk/branches/3.0.x/lib/asc.jar
      flex/sdk/branches/3.0.x/modules/antTasks/src/flex/ant/AscTask.java
      flex/sdk/branches/3.0.x/modules/antTasks/src/flex/ant/CompcTask.java
      flex/sdk/branches/3.0.x/modules/antTasks/src/flex/ant/FlexTask.java
      flex/sdk/branches/3.0.x/modules/antTasks/src/flex/ant/MxmlcTask.java
      flex/sdk/branches/3.0.x/modules/antTasks/src/flex/ant/config/ConfigVariable.java
      flex/sdk/branches/3.0.x/modules/antTasks/src/flex/ant/config/NestedAttributeElement.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flash/swf/tools/as3/EvaluatorAdapter.ja va
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/API.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/PersistenceStore.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/SymbolTable.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/as3/MetaDataParser.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/as3/SignatureEvaluator.j ava
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/as3/SignatureExtension.j ava
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/as3/reflect/NodeMagic.ja va
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/common/CompilerConfigura tion.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/common/Configuration.jav a
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/common/DefaultsConfigura tor.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/css/StyleDef.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/css/StyleModule.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/css/StylesContainer.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.j ava
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/mxml/reflect/TypeTable.j ava
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/compiler/mxml/rep/AtEmbed.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/linker/Configuration.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/linker/SimpleMovie.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/Compiler.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/MovieMetaData.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/Target.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/oem/Application.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/oem/Library.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/oem/Toolkit.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/oem/internal/ApplicationDat a.java
      flex/sdk/branches/3.0.x/modules/compiler/src/java/flex2/tools/oem/internal/OEMUtil.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/Movie.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tools/SwfxPrinter.java
      flex/sdk/branches/3.0.x/modules/swfutils/src/java/flash/swf/tools/SyntaxTreeDumper.java

      Added Paths:
      -----------
      flex/sdk/branches/3.0.x/frameworks/libs/player/9/
      flex/sdk/branches/3.0.x/frameworks/libs/player/9/playerglobal.swc

      Removed Paths:
      -------------
      flex/sdk/branches/3.0.x/frameworks/libs/player/playerglobal.swc