This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 7ae2409ceea992de736d3e78e727093351de2fac Author: Christofer Dutz <[email protected]> AuthorDate: Sun Mar 7 12:59:51 2021 +0100 - Made the build remove the library-path elements in case of a "without-swf" build. --- distribution/pom.xml | 4 ++++ distribution/src/main/xslt/process-configs.xsl | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index eef1d6a..2412fd2 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -190,6 +190,10 @@ <name>StripSwf</name> <value>${strip-swf}</value> </parameter> + <parameter> + <name>FlashBuilderSupport</name> + <value>true</value> + </parameter> </parameters> <outputDir>${project.build.directory}/processed-configs</outputDir> </transformationSet> diff --git a/distribution/src/main/xslt/process-configs.xsl b/distribution/src/main/xslt/process-configs.xsl index c1d19c7..a7473b5 100644 --- a/distribution/src/main/xslt/process-configs.xsl +++ b/distribution/src/main/xslt/process-configs.xsl @@ -24,6 +24,7 @@ <xsl:param name="PlayerVersion"/> <xsl:param name="Locale"/> <xsl:param name="StripSwf"/> + <xsl:param name="FlashBuilderSupport"/> <xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" /> <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" /> @@ -57,11 +58,16 @@ <!-- Filter out the references to the playerglobal, if StripSwf is not set to 'false' --> <xsl:template match="library-path"> <xsl:copy> - <xsl:for-each select="text() | path-element"> - <xsl:if test="$StripSwf = 'false' or text() != '{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}'"> - <xsl:apply-templates select="."/> - </xsl:if> - </xsl:for-each> + <xsl:choose> + <xsl:when test="$StripSwf = 'true'"> + <xsl:if test="$FlashBuilderSupport = 'true'"> + <path-element>libs/KeepsFBFromHanging.swc</path-element> + </xsl:if> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="* | text()"/> + </xsl:otherwise> + </xsl:choose> </xsl:copy> </xsl:template>
