Return-Path: <commits-return-27889-archive-asf-public=cust-asf.ponee.io@flex.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 32590200AC8
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  7 Jun 2016 18:36:13 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 31051160A36; Tue,  7 Jun 2016 16:36:13 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 545E6160968
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  7 Jun 2016 18:36:12 +0200 (CEST)
Received: (qmail 60506 invoked by uid 500); 7 Jun 2016 16:36:11 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 60498 invoked by uid 99); 7 Jun 2016 16:36:11 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jun 2016 16:36:11 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 0539EDFDA9; Tue,  7 Jun 2016 16:36:11 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aharui@apache.org
To: commits@flex.apache.org
Message-Id: <4fc09a94ccd64831900eea73163615de@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: [flex-asjs] [refs/heads/spark] - move -defines into
 config file
Date: Tue,  7 Jun 2016 16:36:11 +0000 (UTC)
archived-at: Tue, 07 Jun 2016 16:36:13 -0000

Repository: flex-asjs
Updated Branches:
  refs/heads/spark aa5bf9625 -> db3d64f82


move -defines into config file


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

Branch: refs/heads/spark
Commit: db3d64f82d7221ae46516bc53b64bca826574144
Parents: aa5bf96
Author: Alex Harui <aharui@apache.org>
Authored: Tue Jun 7 09:36:07 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Jun 7 09:36:07 2016 -0700

----------------------------------------------------------------------
 frameworks/js/FlexJS/projects/MXJS/build.xml      |  8 --------
 .../MXJS/src/main/config/compile-js-config.xml    | 18 ++++++++++++++++++
 frameworks/projects/MX/build.xml                  |  4 ----
 .../MX/src/main/config/compile-as-config.xml      | 18 ++++++++++++++++++
 4 files changed, 36 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/db3d64f8/frameworks/js/FlexJS/projects/MXJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/MXJS/build.xml b/frameworks/js/FlexJS/projects/MXJS/build.xml
index e89c7f6..5618669 100644
--- a/frameworks/js/FlexJS/projects/MXJS/build.xml
+++ b/frameworks/js/FlexJS/projects/MXJS/build.xml
@@ -66,10 +66,6 @@
             <arg value="-external-library-path+=${JS.SWC}" />
             <!-- this is not on external-library path otherwise goog.requires are not generated -->
             <arg value="-library-path+=${GCL.SWC}" />
-            <arg value="-define=COMPILE::AS3,false" />
-            <arg value="-define=COMPILE::JS,true" />
-            <arg value="-define=COMPILE::LATER,false" />
-            <arg value="-define=CONFIG::performanceInstrumentation,false" />
         </java>
     </target>
     
@@ -90,10 +86,6 @@
             <arg value="-external-library-path=${JS.SWC}" />
             <!-- this is not on external-library path otherwise goog.requires are not generated -->
             <arg value="-library-path+=${GCL.SWC}" />
-            <arg value="-define=COMPILE::AS3,false" />
-            <arg value="-define=COMPILE::JS,true" />
-            <arg value="-define=COMPILE::LATER,false" />
-            <arg value="-define=CONFIG::performanceInstrumentation,false" />
         </compc>
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" />
     </target>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/db3d64f8/frameworks/js/FlexJS/projects/MXJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/MXJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/MXJS/src/main/config/compile-js-config.xml
index 4441fa2..3555c44 100644
--- a/frameworks/js/FlexJS/projects/MXJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/MXJS/src/main/config/compile-js-config.xml
@@ -32,6 +32,24 @@
 		<binding-value-change-event-type>valueChange</binding-value-change-event-type>
         <allow-subclass-overrides>true</allow-subclass-overrides>
         
+        <!-- Conditional compilation for the framework performance instrumentation code. -->
+        <define>
+            <name>CONFIG::performanceInstrumentation</name>
+            <value>false</value>
+        </define>
+        <define>
+            <name>COMPILE::AS3</name>
+            <value>false</value>
+        </define>
+        <define>
+            <name>COMPILE::JS</name>
+            <value>true</value>
+        </define>
+        <define>
+            <name>COMPILE::LATER</name>
+            <value>false</value>
+        </define>
+        
         <keep-as3-metadata>
           <name>Bindable</name>
           <name>Managed</name>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/db3d64f8/frameworks/projects/MX/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/build.xml b/frameworks/projects/MX/build.xml
index b844b53..75d5564 100644
--- a/frameworks/projects/MX/build.xml
+++ b/frameworks/projects/MX/build.xml
@@ -84,10 +84,6 @@
             <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
-            <arg value="-define=COMPILE::AS3,true" />
-            <arg value="-define=COMPILE::JS,false" />
-            <arg value="-define=COMPILE::LATER,false" />
-            <arg value="-define=CONFIG::performanceInstrumentation,false" />
         </compc>
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />
     </target>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/db3d64f8/frameworks/projects/MX/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/config/compile-as-config.xml b/frameworks/projects/MX/src/main/config/compile-as-config.xml
index ab8609d..c8d699d 100644
--- a/frameworks/projects/MX/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/MX/src/main/config/compile-as-config.xml
@@ -30,6 +30,24 @@
             <path-element>../../../../../libs/Reflection.swc</path-element>
         </external-library-path>
         
+        <!-- Conditional compilation for the framework performance instrumentation code. -->
+        <define>
+            <name>CONFIG::performanceInstrumentation</name>
+            <value>false</value>
+        </define>
+        <define>
+            <name>COMPILE::AS3</name>
+            <value>true</value>
+        </define>
+        <define>
+            <name>COMPILE::JS</name>
+            <value>false</value>
+        </define>
+        <define>
+            <name>COMPILE::LATER</name>
+            <value>false</value>
+        </define>
+        
 		<mxml>
 			<children-as-data>true</children-as-data>
 		</mxml>