You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2024/03/04 23:04:25 UTC

(flex-tlf) branch master updated (e10a51a -> 1b5c3dd)

This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flex-tlf.git


    from e10a51a  FLEX-34098 and FLEX-33985:  Fix more cases in the discretionary hyphens workaround
     new 57f105d  build.xml: allow env.FLEX_HOME
     new 1b5c3dd  env-template.properties

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.xml               |  7 ++++++-
 env-template.properties | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 env-template.properties


(flex-tlf) 02/02: env-template.properties

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flex-tlf.git

commit 1b5c3dd1c4145a2c1d6dce19b4774d859e80fc38
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Mar 4 15:04:12 2024 -0800

    env-template.properties
---
 env-template.properties | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/env-template.properties b/env-template.properties
new file mode 100644
index 0000000..21afe58
--- /dev/null
+++ b/env-template.properties
@@ -0,0 +1,46 @@
+################################################################################
+##
+##  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.
+##
+################################################################################
+
+# If you choose to use this file, rename it to env.properties and uncomment the
+# properties you wish to set.
+
+# For each of
+#
+#   FLEX_HOME
+#
+# you need to set an environment variable with that name or set the property here
+# prefixed with "env.".  If a property is set in this file, and the corresponding 
+# environment variable is also set, the property set here takes precedence over the 
+# corresponding environment variable.
+#
+# Use absolute file paths. 
+# 
+# This is a Java property file.  On Windows if you use the '\' file 
+# separator you must use "\\", but not escape spaces, for example,
+#
+#       env.FLEX_HOME=z:\\tools\\flex\\apache-flex-sdk-4.16.1
+#                      or
+#       env.FLEX_HOME=C:\\Program Files (x86)\\Adobe\\Adobe Flash Builder 4\\sdks\\4.1.0
+#
+# See the README file for more information about the different variables.
+
+#
+# Set this to the directory that contains the Apache Flex SDK.
+#
+#env.FLEX_HOME=


(flex-tlf) 01/02: build.xml: allow env.FLEX_HOME

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flex-tlf.git

commit 57f105dee510965325971edcce80486b92899247
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Mar 4 15:04:00 2024 -0800

    build.xml: allow env.FLEX_HOME
---
 build.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 4fffecb..c0e4ccf 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,12 @@
          Override on cmd line with -D=FLEX_HOME=path. -->
 	<property file="${basedir}/local.properties"/>
     <!-- Default Flex SDK is the trunk.  Override on cmd line with -D=FLEX_HOME=path. -->
-	<property name="FLEX_HOME" value="${basedir}/../flex-sdk"/>
+	<condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+		<available file="${env.FLEX_HOME}/lib/compc.jar" type="file" />
+	</condition>
+	<condition property="FLEX_HOME" value="${basedir}/../flex-sdk">
+		<available file="${basedir}/../flex-sdk/lib/compc.jar" type="file" />
+	</condition>
 	<echo>FLEX_HOME is ${FLEX_HOME}</echo>