Skip to content

Commit

Permalink
Testing fix for overlaying issue at Bamboo (#32)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rat-moonshine
rat-moonshine committed Jul 19, 2021
1 parent f7406bd commit 90ab2b8
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 10 deletions.
26 changes: 24 additions & 2 deletions MoonshineSDKInstaller/src/actionScripts/utils/HarmanInstallerScriptFix.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,21 @@ package actionScripts.utils
// installer.xml always triggering mountDMG on macOS
installerContent = installerContent.replace(
'<target name="air-setup-mac" depends="unzipOrMountDMG,unzipAIRSDK,mountAIRSDK,copyFromMount,unmountAIRSDK">',
'<target name="air-setup-mac" depends="unzipOrMountDMG,unzipAIRSDK2">'
'<target name="air-setup-mac" depends="unzipOrMountDMG,unzipAIRSDK2,copyFromMount">'
);

// modify to `copyFromMount` to work correctly
installerContent = installerContent.replace(
'<target name="copyFromMount" unless="${shouldUnzip}">',
'<target name="copyFromMount">'
);
installerContent = installerContent.replace(
'<arg value="/Volumes/AIR SDK/"/>',
'<arg value="${download.dir}/airsdk/."/>'
);
installerContent = installerContent.replace(
'<arg value="${download.dir}/airsdk" />',
'<arg value="${basedir}"/>'
);

// we also need to normalize the downloaded zip file
Expand All @@ -59,7 +73,15 @@ package actionScripts.utils
// 3. individual copying resource list in installer.xml is outdated against harman sdk
installerContent = installerContent.replace(
'<target name="unzipAIRSDK" if="${shouldUnzip}">',
'<target name="unzipAIRSDK2"><echo>Unzipping ${download.dir}/airsdk/'+ tmpFileName +'</echo><exec executable="tar" dir="${basedir}"><arg value="-xvf" /><arg value="${download.dir}/airsdk/'+ tmpFileName +'" /></exec></target><target name="unzipAIRSDK" if="${shouldUnzip}">'
'<target name="unzipAIRSDK2">' +
'<echo>Unzipping ${download.dir}/airsdk/'+ tmpFileName +'</echo>' +
'<exec executable="tar" dir="${download.dir}/airsdk">' +
'<arg value="-xvf" />' +
'<arg value="${download.dir}/airsdk/'+ tmpFileName +'" />' +
'</exec>' +
'<delete file="${download.dir}/airsdk/'+ tmpFileName +'" />' +
'</target>' +
'<target name="unzipAIRSDK" if="${shouldUnzip}">'
);
}
else
Expand Down
8 changes: 7 additions & 1 deletion MoonshineSDKInstaller/src/components/HelperInstaller.mxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,12 +390,18 @@
{
var installFolder:File = new File(itemDownloading.installToPath);
// fixing flex-config
// fixing flex-configs
var flexConfig:File = installFolder.resolvePath("frameworks/flex-config.xml");
var flexConfigContent:String = FileUtils.readFromFile(flexConfig) as String;
flexConfigContent = flexConfigContent.replace(/<target-player>28.0<\/target-player>/g, "<target-player>33.1</target-player>");
flexConfigContent = flexConfigContent.replace(/<swf-version>43<\/swf-version>/g, "<swf-version>44</swf-version>");
FileUtils.writeToFile(flexConfig, flexConfigContent);
flexConfig = installFolder.resolvePath("frameworks/air-config.xml");
flexConfigContent = FileUtils.readFromFile(flexConfig) as String;
flexConfigContent = flexConfigContent.replace(/<target-player>28.0<\/target-player>/g, "<target-player>33.1</target-player>");

This comment has been minimized.

Sign in to view

Copy link
@piotrzarzycki21

piotrzarzycki21 Jul 19, 2021

Collaborator

This is exactly what is wrong. Value shouldn't be 33.1, it should be 32.0.

This comment has been minimized.

Sign in to view

Copy link
@rat-moonshine

rat-moonshine Jul 19, 2021

Author Collaborator

I know it is suppose to be 32 because Harman do not supply any /libs/player/33.1 version. However, Moonshine is using this version value coming from flex-config.xml (or air-config.xml) to update the namespace value in *-app.xml file in bin-debug during an application run for Harman AIR project - failing that adl unable to run the Harman compiled application.

Do you have any suggestion where else Moonshine can get this namespace value in SDK folder, which can be reliable for Harman and non-Harman projects to update namespace?

This comment has been minimized.

Sign in to view

Copy link
@piotrzarzycki21

piotrzarzycki21 Jul 19, 2021 •
edited

Collaborator

Yes. This value should be taken from airsdk.xml file. This file after SDK download is in main folder.

This comment has been minimized.

Sign in to view

Copy link
@rat-moonshine

rat-moonshine Jul 19, 2021

Author Collaborator

Sounds good! We'll need to have this modified in Moonshine then.

This comment has been minimized.

Sign in to view

Copy link
@piotrzarzycki21

piotrzarzycki21 Jul 19, 2021

Collaborator

Fix first SDK installer. There are people who are trying to use Nightly for downloading Harman Air.
flexConfigContent = flexConfigContent.replace(/<swf-version>43<\/swf-version>/g, "<swf-version>44</swf-version>");

This comment has been minimized.

Sign in to view

Copy link
@piotrzarzycki21

piotrzarzycki21 Jul 19, 2021

Collaborator

Here 43 as swf-version
FileUtils.writeToFile(flexConfig, flexConfigContent);
}
/*if (itemDownloading.type == ComponentTypes.TYPE_FLEX_HARMAN && !isHarmanAIRDownloading)
Expand Down
Binary file modified MoonshineSDKInstallerGUICore/bin/flash/bin/MoonshineSDKInstallerGUICore.swc
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion MoonshineSDKInstallerGUICore/bin/flash/haxe/ApplicationMain.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ApplicationMain

ManifestResources.init(config);

app.meta["build"] = "327";
app.meta["build"] = "352";
app.meta["company"] = "Prominic.NET";
app.meta["file"] = "MoonshineSDKInstallerGUICore";
app.meta["name"] = "MoonshineSDKInstallerGUICore";
Expand Down
4 changes: 2 additions & 2 deletions MoonshineSDKInstallerGUICore/bin/flash/haxe/debug.hxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
--macro lime._internal.macros.DefineMacro.run()
-cp /usr/local/lib/haxe/lib/lime/7,9,0/src
-D lime=7.9.0
-cp /usr/local/lib/haxe/lib/feathersui/1,0,0-beta,3/src
-D feathersui=1.0.0-beta.3
-cp /usr/local/lib/haxe/lib/feathersui/1,0,0-beta,4/src
-D feathersui=1.0.0-beta.4
-cp /usr/local/lib/haxe/lib/actuate/1,8,9/src
-D actuate=1.8.9
-cp /usr/local/lib/haxe/lib/hxargs/3,0,2
Expand Down
4 changes: 2 additions & 2 deletions MoonshineSDKInstallerGUICore/bin/flash/haxe/final.hxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
--macro lime._internal.macros.DefineMacro.run()
-cp /usr/local/lib/haxe/lib/lime/7,9,0/src
-D lime=7.9.0
-cp /usr/local/lib/haxe/lib/feathersui/1,0,0-beta,3/src
-D feathersui=1.0.0-beta.3
-cp /usr/local/lib/haxe/lib/feathersui/1,0,0-beta,4/src
-D feathersui=1.0.0-beta.4
-cp /usr/local/lib/haxe/lib/actuate/1,8,9/src
-D actuate=1.8.9
-cp /usr/local/lib/haxe/lib/hxargs/3,0,2
Expand Down
4 changes: 2 additions & 2 deletions MoonshineSDKInstallerGUICore/bin/flash/haxe/release.hxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
--macro lime._internal.macros.DefineMacro.run()
-cp /usr/local/lib/haxe/lib/lime/7,9,0/src
-D lime=7.9.0
-cp /usr/local/lib/haxe/lib/feathersui/1,0,0-beta,3/src
-D feathersui=1.0.0-beta.3
-cp /usr/local/lib/haxe/lib/feathersui/1,0,0-beta,4/src
-D feathersui=1.0.0-beta.4
-cp /usr/local/lib/haxe/lib/actuate/1,8,9/src
-D actuate=1.8.9
-cp /usr/local/lib/haxe/lib/hxargs/3,0,2
Expand Down

0 comments on commit 90ab2b8

Please sign in to comment.