Skip to content

Commit f24e702

Browse files
MeychiMeychi
committed
Improved scripts and new appman.xml...
1 parent 95f04d9 commit f24e702

File tree

3 files changed

+142
-26
lines changed

3 files changed

+142
-26
lines changed

‎External/Scripts/InstallHaxeFlixel.cmd

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,55 @@
1+
::
12
:: Script for installing HaxeFlixel and it's dependencies.
3+
:: Path refresh adapted from: https://github.com/chocolatey/chocolatey/blob/master/src/redirects/RefreshEnv.cmd
4+
::
25
@echo off
36

7+
echo Refreshing PATH from registry...
8+
goto :refresh_path
9+
10+
:setfromreg
11+
12+
"%WinDir%\System32\Reg" QUERY "%~1" /v "%~2" > "%TEMP%\_envset.tmp" 2>NUL
13+
for /f "usebackq skip=2 tokens=2,*" %%A IN ("%TEMP%\_envset.tmp") do (
14+
echo/set %~3=%%B
15+
)
16+
goto :EOF
17+
18+
:getregenv
19+
20+
"%WinDir%\System32\Reg" QUERY "%~1" > "%TEMP%\_envget.tmp"
21+
for /f "usebackq skip=2" %%A IN ("%TEMP%\_envget.tmp") do (
22+
if /I not "%%~A"=="Path" (
23+
call :setfromreg "%~1" "%%~A" "%%~A"
24+
)
25+
)
26+
goto :EOF
27+
28+
:refresh_path
29+
30+
echo/@echo off >"%TEMP%\_env.cmd"
31+
32+
:: Slowly generating final file
33+
call :getregenv "HKLM\System\CurrentControlSet\Control\Session Manager\Environment" >> "%TEMP%\_env.cmd"
34+
call :getregenv "HKCU\Environment">>"%TEMP%\_env.cmd" >> "%TEMP%\_env.cmd"
35+
36+
:: Special handling for PATH - mix both User and System
37+
call :setfromreg "HKLM\System\CurrentControlSet\Control\Session Manager\Environment" Path Path_HKLM >> "%TEMP%\_env.cmd"
38+
call :setfromreg "HKCU\Environment" Path Path_HKCU >> "%TEMP%\_env.cmd"
39+
40+
:: Caution: do not insert space-chars before >> redirection sign
41+
echo/set Path=%%Path_HKLM%%;%%Path_HKCU%% >> "%TEMP%\_env.cmd"
42+
43+
:: Cleanup
44+
del /f /q "%TEMP%\_envset.tmp" 2>nul
45+
del /f /q "%TEMP%\_envget.tmp" 2>nul
46+
47+
:: Set these variables
48+
call "%TEMP%\_env.cmd"
49+
50+
echo OK
51+
goto :check_haxelib
52+
453
:check_haxelib
554

655
echo Checking Haxelib...
@@ -62,7 +111,7 @@ goto :done
62111

63112
:haxelib_error
64113

65-
echo Haxe is not installed. Please install Haxe first or if it's installed, restart Windows before continuing.
114+
echo Haxe seems not to be installed. Please install Haxe first or if it's installed, restart Windows before continuing.
66115
pause
67116
exit -1
68117

‎External/Scripts/InstallOpenFL.cmd

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,55 @@
1+
::
12
:: Script for installing OpenFL and it's dependencies.
3+
:: Path refresh adapted from: https://github.com/chocolatey/chocolatey/blob/master/src/redirects/RefreshEnv.cmd
4+
::
25
@echo off
36

7+
echo Refreshing PATH from registry...
8+
goto :refresh_path
9+
10+
:setfromreg
11+
12+
"%WinDir%\System32\Reg" QUERY "%~1" /v "%~2" > "%TEMP%\_envset.tmp" 2>NUL
13+
for /f "usebackq skip=2 tokens=2,*" %%A IN ("%TEMP%\_envset.tmp") do (
14+
echo/set %~3=%%B
15+
)
16+
goto :EOF
17+
18+
:getregenv
19+
20+
"%WinDir%\System32\Reg" QUERY "%~1" > "%TEMP%\_envget.tmp"
21+
for /f "usebackq skip=2" %%A IN ("%TEMP%\_envget.tmp") do (
22+
if /I not "%%~A"=="Path" (
23+
call :setfromreg "%~1" "%%~A" "%%~A"
24+
)
25+
)
26+
goto :EOF
27+
28+
:refresh_path
29+
30+
echo/@echo off >"%TEMP%\_env.cmd"
31+
32+
:: Slowly generating final file
33+
call :getregenv "HKLM\System\CurrentControlSet\Control\Session Manager\Environment" >> "%TEMP%\_env.cmd"
34+
call :getregenv "HKCU\Environment">>"%TEMP%\_env.cmd" >> "%TEMP%\_env.cmd"
35+
36+
:: Special handling for PATH - mix both User and System
37+
call :setfromreg "HKLM\System\CurrentControlSet\Control\Session Manager\Environment" Path Path_HKLM >> "%TEMP%\_env.cmd"
38+
call :setfromreg "HKCU\Environment" Path Path_HKCU >> "%TEMP%\_env.cmd"
39+
40+
:: Caution: do not insert space-chars before >> redirection sign
41+
echo/set Path=%%Path_HKLM%%;%%Path_HKCU%% >> "%TEMP%\_env.cmd"
42+
43+
:: Cleanup
44+
del /f /q "%TEMP%\_envset.tmp" 2>nul
45+
del /f /q "%TEMP%\_envget.tmp" 2>nul
46+
47+
:: Set these variables
48+
call "%TEMP%\_env.cmd"
49+
50+
echo OK
51+
goto :check_haxelib
52+
453
:check_haxelib
554

655
echo Checking Haxelib...
@@ -39,7 +88,7 @@ goto :done
3988

4089
:haxelib_error
4190

42-
echo Haxe is not installed. Please install Haxe first or if it's installed, restart Windows before continuing.
91+
echo Haxe seems not to be installed. Please install Haxe first or if it's installed, restart Windows before continuing.
4392
pause
4493
exit -1
4594

‎appman.xml

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Entries xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<Entry>
4-
<Id>haxe3setup2</Id>
4+
<Id>haxe3setup</Id>
55
<Name>Haxe + Neko</Name>
66
<Version>3.2.1</Version>
77
<Build>1</Build>
@@ -125,37 +125,37 @@
125125
</Urls>
126126
</Entry>
127127
<Entry>
128-
<Id>flashns</Id>
129-
<Name>Flash Player (NPAPI)</Name>
128+
<Id>flashie</Id>
129+
<Name>Flash Player (AX)</Name>
130130
<Version>20.0.0</Version>
131-
<Build>235</Build>
132-
<Desc>Debug Flash Player plugin for Firefox - NPAPI</Desc>
131+
<Build>228</Build>
132+
<Desc>Debug Flash Player plugin for Internet Explorer - ActiveX</Desc>
133133
<Group>Runtimes</Group>
134134
<Type>Executable</Type>
135135
<Info>http://www.adobe.com/support/flashplayer/downloads.html</Info>
136136
<Urls>
137-
<Url>http://download.macromedia.com/pub/flashplayer/updaters/20/flashplayer_20_plugin_debug.exe</Url>
137+
<Url>https://fpdownload.macromedia.com/pub/flashplayer/updaters/20/flashplayer_20_ax_debug.exe</Url>
138138
</Urls>
139139
</Entry>
140140
<Entry>
141-
<Id>flashie</Id>
142-
<Name>Flash Player (AX)</Name>
141+
<Id>flashnpapi</Id>
142+
<Name>Flash Player (NPAPI)</Name>
143143
<Version>20.0.0</Version>
144-
<Build>228</Build>
145-
<Desc>Debug Flash Player plugin for Internet Explorer - ActiveX</Desc>
144+
<Build>235</Build>
145+
<Desc>Debug Flash Player plugin for Firefox - NPAPI</Desc>
146146
<Group>Runtimes</Group>
147147
<Type>Executable</Type>
148148
<Info>http://www.adobe.com/support/flashplayer/downloads.html</Info>
149149
<Urls>
150-
<Url>https://fpdownload.macromedia.com/pub/flashplayer/updaters/20/flashplayer_20_ax_debug.exe</Url>
150+
<Url>http://download.macromedia.com/pub/flashplayer/updaters/20/flashplayer_20_plugin_debug.exe</Url>
151151
</Urls>
152152
</Entry>
153153
<Entry>
154154
<Id>flashppapi</Id>
155155
<Name>Flash Player (PPAPI)</Name>
156156
<Version>20.0.0</Version>
157157
<Build>228</Build>
158-
<Desc>Debug Flash Player plugin for Opera and Chromium based applications – PPAPI</Desc>
158+
<Desc>Debug Flash Player plugin for Opera and Chromium based applications - PPAPI</Desc>
159159
<Group>Runtimes</Group>
160160
<Type>Executable</Type>
161161
<Info>http://www.adobe.com/support/flashplayer/downloads.html</Info>
@@ -211,8 +211,8 @@
211211
<Url>https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/Git-2.7.2-32-bit.exe</Url>
212212
</Urls>
213213
</Entry>
214-
<Entry>
215-
<Id>git4win</Id>
214+
<Entry>
215+
<Id>git4win64</Id>
216216
<Name>Git For Windows (x64)</Name>
217217
<Version>2.7.2</Version>
218218
<Build>1</Build>
@@ -225,7 +225,7 @@
225225
<Info>http://msysgit.github.io/</Info>
226226
<Urls>
227227
<Url>https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/Git-2.7.2-64-bit.exe</Url>
228-
</Urls>
228+
</Urls>
229229
</Entry>
230230
<Entry>
231231
<Id>torsvn</Id>
@@ -256,7 +256,7 @@
256256
<Type>Executable</Type>
257257
<Info>http://tortoisesvn.net/</Info>
258258
<Urls>
259-
<Url>https://sourceforge.net/projects/tortoisesvn/files/1.9.3/Application/TortoiseSVN-1.9.3.27038-x64-svn-1.9.3.msi</Url>
259+
<Url>https://sourceforge.net/projects/tortoisesvn/files/1.9.3/Application/TortoiseSVN-1.9.3.27038-x64-svn-1.9.3.msi</Url>
260260
</Urls>
261261
</Entry>
262262
<Entry>
@@ -275,8 +275,8 @@
275275
<Url>https://sliksvn.com/pub/Slik-Subversion-1.9.3-win32.msi</Url>
276276
</Urls>
277277
</Entry>
278-
<Entry>
279-
<Id>sliksvn</Id>
278+
<Entry>
279+
<Id>sliksvn64</Id>
280280
<Name>SlikSVN Client (x64)</Name>
281281
<Version>1.9.3</Version>
282282
<Build>1</Build>
@@ -291,12 +291,12 @@
291291
<Url>https://sliksvn.com/pub/Slik-Subversion-1.9.3-x64.msi</Url>
292292
</Urls>
293293
</Entry>
294-
<Entry>
294+
<Entry>
295295
<Id>torhg</Id>
296296
<Name>TortoiseHg (x86)</Name>
297297
<Version>3.7.1</Version>
298298
<Build>1</Build>
299-
<Desc>TortoiseHg (including Mercurial) 3.7.1 - x86</Desc>
299+
<Desc>TortoiseHg (including Mercurial) 32-bit installer</Desc>
300300
<Group>Source Control</Group>
301301
<Bundles>
302302
<Bundle>HG</Bundle>
@@ -307,12 +307,12 @@
307307
<Url>http://bitbucket.org/tortoisehg/files/downloads/tortoisehg-3.7.1-x86.msi</Url>
308308
</Urls>
309309
</Entry>
310-
<Entry>
310+
<Entry>
311311
<Id>torhg64</Id>
312312
<Name>TortoiseHg (x64)</Name>
313313
<Version>3.7.1</Version>
314314
<Build>1</Build>
315-
<Desc>TortoiseHg (including Mercurial) 3.7.1 - x64</Desc>
315+
<Desc>TortoiseHg (including Mercurial) 64-bit installer</Desc>
316316
<Group>Source Control</Group>
317317
<Bundles>
318318
<Bundle>HG</Bundle>
@@ -329,7 +329,7 @@
329329
<Version>1.01</Version>
330330
<Build>1</Build>
331331
<Desc>Adds archived legacy AS2 templates</Desc>
332-
<Group>Extensions</Group>
332+
<Group>Templates</Group>
333333
<Info>http://www.flashdevelop.org/wikidocs/</Info>
334334
<Urls>
335335
<Url>https://raw.github.com/fdorg/flashdevelop/development/External/Extensions/AS2Templates/AS2Templates-1.01.fdz</Url>
@@ -342,14 +342,29 @@
342342
<Version>1.00</Version>
343343
<Build>1</Build>
344344
<Desc>Adds archived legacy AS3 templates</Desc>
345-
<Group>Extensions</Group>
345+
<Group>Templates</Group>
346346
<Info>http://www.flashdevelop.org/wikidocs/</Info>
347347
<Urls>
348348
<Url>https://raw.github.com/fdorg/flashdevelop/development/External/Extensions/AS3Templates/AS3Templates-1.00.fdz</Url>
349349
</Urls>
350350
</Entry>
351351
HD5-->
352352
<!--FD5
353+
<Entry>
354+
<Id>flixeltmpl</Id>
355+
<Name>HaxeFlixel Template</Name>
356+
<Version>1.00</Version>
357+
<Build>1</Build>
358+
<Desc>Adds HaxeFlixel default template</Desc>
359+
<Group>Templates</Group>
360+
<Bundles>
361+
<Bundle>HaxeFlixel</Bundle>
362+
</Bundles>
363+
<Info>http://haxeflixel.com/</Info>
364+
<Urls>
365+
<Url>https://github.com/HaxeFlixel/flixel-templates/raw/8732ce62810d10d86c31b5aa5cc22ee2f1730c7b/pregenerated/FlxProject.fdz</Url>
366+
</Urls>
367+
</Entry>
353368
<Entry>
354369
<Id>colorbox</Id>
355370
<Name>ColorBox</Name>
@@ -568,6 +583,9 @@
568583
<Desc>Installs HaxeFlixel and its dependencies with Haxelib.</Desc>
569584
<Group>Haxelib</Group>
570585
<Type>Executable</Type>
586+
<Bundles>
587+
<Bundle>HaxeFlixel</Bundle>
588+
</Bundles>
571589
<Info>https://github.com/fdorg/flashdevelop/tree/development/External/Scripts</Info>
572590
<Urls>
573591
<Url>https://raw.github.com/fdorg/flashdevelop/development/External/Scripts/InstallHaxeFlixel.cmd</Url>

0 commit comments

Comments
 (0)