Added playerglobal.swc and airglobal.swf now part of FFDec bundle

.github/workflows/main.yml

@@ -56,5 +56,4 @@ jobs:
         export CICD_TEMP=${{ runner.temp }}
         chmod a+x ./cicd_scripts/*.sh
         ./cicd_scripts/before_install.sh
-        ./cicd_scripts/install.sh
         ./cicd_scripts/script.sh

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Translator tool for easier localization
 - AS3 improved goto declaration for properties and methods
+- playerglobal.swc and airglobal.swf now part of FFDec bundle
 
 ### Fixed
 - [#1769] AS3 - Missing some body trait variable declaration

build.properties

@@ -97,5 +97,4 @@ lib.prefix.filename = ffdec_lib
 dist.lib.dirname = lib
 javadoc.dir = javadoc
         
-ant.lib.dir = antlib
-adobe.playerglobal.path = cicd_scripts/tools/playerglobal32_0.swc
+ant.lib.dir = antlib

build.xml

@@ -543,7 +543,7 @@
         
     </target>                         
         
-    <target name="dist" depends="build,exe">
+    <target name="res">
         <copy todir="${dist.dir}">
             <fileset dir="${resources.dir}" includes="**/*.*"/>
         </copy>
@@ -553,6 +553,9 @@
         <fixcrlf srcdir="${dist.dir}" includes="**/*.sh" eol="lf" preservelastmodified="true" />
         <fixcrlf srcdir="${dist.dir}" includes="**/*.bat" eol="crlf" preservelastmodified="true" />
     </target>    
+    <target name="dist" depends="build,exe">
+        
+    </target>    
     
     <target name="-nightly-suffix" if="nightly">        
         <property name="version.suffix" value="_nightly${version.build}"/>         
@@ -645,7 +648,7 @@
         
     </target>
     
-    <target name="build" depends="-loadversion,build_lib,-copy-lib,-timestamp,-suffix,compile">        
+    <target name="build" depends="-loadversion,build_lib,-copy-lib,-timestamp,-suffix,compile,res">        
         <mkdir dir="${dist.dir}"/>
         <!-- <delete dir="${dist.lib.dir}"/> -->
         <mkdir dir="${dist.lib.dir}"/>
@@ -885,17 +888,8 @@
                                                                                                                                                                                                                                                                                                     
     <target name="-get-home" depends="-get-home-from-user-windows-appdata,-get-home-from-user-windows-home,-get-home-from-user-osx-home,-get-home-from-user,-get-home-no">        
         
-    </target>
+    </target> 
     
-    <target name="-get-playerglobal-home" depends="-get-home">
-        <property name="playerglobal.homedir" value="${app.homedir}/flashlib"/>
-        <mkdir dir="${playerglobal.homedir}"/>
-        <echo message="PlayerGlobal homedir: ${playerglobal.homedir}" level="info"/>
-    </target>
-    
-    <target name="download-playerglobal" depends="-get-playerglobal-home">
-        <copy file="${adobe.playerglobal.path}" todir="${playerglobal.homedir}" />                
-    </target>
     <target name="fix-src-endoflines">
         <fixcrlf srcdir="${src.dir}" includes="**/*.java" />
         <fixcrlf srcdir="${src.dir}" includes="**/*.properties" />
@@ -907,7 +901,4 @@
         <fixcrlf srcdir="${src.dir}" includes="**/*.sh" eol="lf" />
         <ant antfile="${core.lib.script}" target="fix-src-endoflines" inheritAll="false" usenativebasedir="true" />        
     </target>
-    <target name="deps" depends="download-playerglobal">
-        
-    </target>        
 </project>

cicd_scripts/install.sh

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-ant deps

libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java

@@ -33,6 +33,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.lang.reflect.Field;
+import java.net.URISyntaxException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
@@ -1228,7 +1229,31 @@ public final class Configuration {
         return getUrlFromDownloadsHtml(".*<a href=\"([^\"]*flashplayer[^\"]*_sa\\.i386\\.tar\\.gz)\".*");
     }
 
-    public static File getPlayerSWC() {
+    private static File getFFDecFlashLib(String name) {
+        try {
+            File ffdecLibJarFile = new File(Configuration.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+            File ffdecDirectory = null;
+            if (ffdecLibJarFile.getAbsolutePath().endsWith(".jar")) {
+                ffdecDirectory = ffdecLibJarFile.getParentFile().getParentFile();                
+            } else if (ffdecLibJarFile.getAbsolutePath().replace("\\", "/").endsWith("libsrc/ffdec_lib/build/classes")) {
+                ffdecDirectory = ffdecLibJarFile.getParentFile().getParentFile().getParentFile().getParentFile();
+                ffdecDirectory = new File(Path.combine(ffdecDirectory.getAbsolutePath(), "resources"));
+            } else {
+                return null;
+            }
+            File flashLibDirectory = new File(Path.combine(ffdecDirectory.getAbsolutePath(), "flashlib"));
+            File flashLib = new File(Path.combine(flashLibDirectory.getAbsolutePath(), name));
+            
+            if (!flashLib.exists()) {
+                return null;
+            }
+            return flashLib;
+        } catch (URISyntaxException ex) {
+            return null;
+        }
+    }
+    
+    public static File getPlayerSWC() {        
         String libLocation = playerLibLocation.get("");
         File ret = null;
         if (!libLocation.isEmpty()) {
@@ -1239,6 +1264,9 @@ public final class Configuration {
             if (ret != null) {
                 playerLibLocation.set(ret.getAbsolutePath());
             }
+            if (ret == null) {
+                ret = getFFDecFlashLib("playerglobal32_0.swc");
+            }
         }
         return ret;
     }
@@ -1254,6 +1282,9 @@ public final class Configuration {
             if (ret != null) {
                 airLibLocation.set(ret.getAbsolutePath());
             }
+            if (ret == null) {
+                ret = getFFDecFlashLib("airglobal.swc");
+            }
         }
         return ret;
     }