Skip to content

Commit 35d6050

Browse files
authored
Merge branch '8.2.0-Dev' into mingw-fixes-8.2.0-Dev
2 parents c7c386d + 24bc9b2 commit 35d6050

File tree

1,896 files changed

+188688
-9722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,896 files changed

+188688
-9722
lines changed

.github/workflows/main.yml

Lines changed: 77 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ jobs:
55

66
linux-ndll:
77
runs-on: ubuntu-20.04
8-
strategy:
9-
matrix:
10-
haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5]
118
steps:
129

1310
- uses: actions/checkout@v3
@@ -21,15 +18,15 @@ jobs:
2118
2219
- uses: krdlab/setup-haxe@v1
2320
with:
24-
haxe-version: ${{ matrix.haxe-version }}
21+
haxe-version: 4.2.5
2522

2623
- name: Set HAXEPATH
2724
run: |
2825
echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV
2926
3027
- name: Install Haxe dependencies
3128
run: |
32-
haxelib install hxcpp --quiet
29+
haxelib install hxcpp 4.2.1 --quiet
3330
haxelib install format --quiet
3431
haxelib install hxp --quiet
3532
@@ -50,7 +47,6 @@ jobs:
5047
lime rebuild hl -clean -release -nocolor -verbose -nocffi
5148
5249
- uses: actions/upload-artifact@v3
53-
if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe
5450
with:
5551
name: Linux-NDLL
5652
path: |
@@ -59,7 +55,6 @@ jobs:
5955
if-no-files-found: error
6056

6157
- uses: actions/upload-artifact@v3
62-
if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe
6358
with:
6459
name: Linux64-NDLL
6560
path: |
@@ -68,7 +63,6 @@ jobs:
6863
if-no-files-found: error
6964

7065
- uses: actions/upload-artifact@v3
71-
if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe
7266
with:
7367
name: Linux64-Hashlink
7468
path: |
@@ -101,7 +95,7 @@ jobs:
10195
rm /usr/local/bin/python3*
10296
brew bundle
10397
popd
104-
haxelib install hxcpp --quiet
98+
haxelib install hxcpp 4.2.1 --quiet
10599
haxelib install format --quiet
106100
haxelib install hxp --quiet
107101
@@ -153,7 +147,7 @@ jobs:
153147
154148
- name: Install Haxe dependencies
155149
run: |
156-
haxelib install hxcpp --quiet
150+
haxelib install hxcpp 4.2.1 --quiet
157151
haxelib install format --quiet
158152
haxelib install hxp --quiet
159153
@@ -217,8 +211,9 @@ jobs:
217211
with:
218212
ndk-version: r21e
219213

220-
- uses: actions/setup-java@v1
214+
- uses: actions/setup-java@v3
221215
with:
216+
distribution: "zulu"
222217
java-version: 11
223218

224219
- uses: krdlab/setup-haxe@v1
@@ -231,7 +226,7 @@ jobs:
231226
232227
- name: Install Haxe dependencies
233228
run: |
234-
haxelib install hxcpp --quiet
229+
haxelib install hxcpp 4.2.1 --quiet
235230
haxelib install format --quiet
236231
haxelib install hxp --quiet
237232
@@ -289,7 +284,7 @@ jobs:
289284
290285
- name: Install Haxe dependencies
291286
run: |
292-
haxelib install hxcpp --quiet
287+
haxelib install hxcpp 4.2.1 --quiet
293288
haxelib install format --quiet
294289
haxelib install hxp --quiet
295290
@@ -339,7 +334,7 @@ jobs:
339334
340335
- name: Install Haxe dependencies
341336
run: |
342-
haxelib install hxcpp --quiet
337+
haxelib install hxcpp 4.2.1 --quiet
343338
haxelib install format --quiet
344339
haxelib install hxp --quiet
345340
@@ -424,8 +419,6 @@ jobs:
424419
steps:
425420

426421
- uses: actions/checkout@v3
427-
with:
428-
submodules: true
429422

430423
- uses: krdlab/setup-haxe@v1
431424
with:
@@ -462,8 +455,9 @@ jobs:
462455
with:
463456
ndk-version: r15c
464457

465-
- uses: actions/setup-java@v1
458+
- uses: actions/setup-java@v3
466459
with:
460+
distribution: "zulu"
467461
java-version: 11
468462

469463
- uses: krdlab/setup-haxe@v1
@@ -476,7 +470,7 @@ jobs:
476470
477471
- name: Install Haxe dependencies
478472
run: |
479-
haxelib install hxcpp --quiet
473+
haxelib install hxcpp 4.2.1 --quiet
480474
haxelib install format --quiet
481475
haxelib install hxp --quiet
482476
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
@@ -554,51 +548,70 @@ jobs:
554548
lime build SimpleImage flash -release -verbose -nocolor
555549
lime build SimpleAudio flash -release -verbose -nocolor
556550
557-
hashlink-samples:
551+
air-samples:
558552
needs: package-haxelib
553+
runs-on: windows-latest
559554
strategy:
560555
matrix:
561-
os: [ubuntu-20.04
562-
, macos-11, windows-latest]
563-
runs-on: ${{ matrix.os }}
556+
haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.1]
564557
steps:
565558

566559
- uses: krdlab/setup-haxe@v1
567560
with:
568561
haxe-version: 4.2.5
569562

570-
- name: Set HAXEPATH (Windows)
571-
if: ${{ startsWith(matrix.os, 'windows-') }}
563+
- uses: joshtynjala/setup-adobe-air-action@v2
564+
with:
565+
air-version: "33.1"
566+
accept-license: true
567+
568+
- name: Set HAXEPATH
572569
run: |
573570
echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV
574571
575-
- name: Set HAXEPATH (macOS/Linux)
576-
if: ${{ !startsWith(matrix.os, 'windows-') }}
572+
- name: Install Haxe dependencies
577573
run: |
578-
echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV
574+
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
575+
576+
- uses: actions/download-artifact@v3
577+
with:
578+
name: lime-haxelib
579+
path: lime-haxelib
579580

580-
- name: Install system dependencies (Linux)
581-
if: ${{ startsWith(matrix.os, 'ubuntu-') }}
581+
- name: Prepare lime
582582
run: |
583-
sudo apt-get update
584-
sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev
583+
haxelib dev lime lime-haxelib
584+
haxelib run lime setup -alias -y -nocffi
585+
haxelib run lime config AIR_SDK ${{ env.AIR_HOME }}
585586
586-
- name: Install Haxe dependencies
587+
- name: Create Lime samples
587588
run: |
588-
haxelib install hxcpp --quiet
589-
haxelib install format --quiet
590-
haxelib install hxp --quiet
591-
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
589+
lime create HelloWorld -verbose -nocolor
590+
lime create SimpleImage -verbose -nocolor
591+
lime create SimpleAudio -verbose -nocolor
592592
593-
- name: Enable HXCPP compile cache (Windows)
594-
if: ${{ startsWith(matrix.os, 'windows-') }}
593+
- name: Build Lime samples
595594
run: |
596-
echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $Env:GITHUB_ENV
595+
lime build HelloWorld air -release -verbose -nocolor
596+
lime build SimpleImage air -release -verbose -nocolor
597+
lime build SimpleAudio air -release -verbose -nocolor
597598
598-
- name: Enable HXCPP compile cache (macOS/Linux)
599-
if: ${{ !startsWith(matrix.os, 'windows-') }}
599+
hashlink-samples:
600+
needs: package-haxelib
601+
runs-on: ubuntu-20.04
602+
steps:
603+
604+
- uses: krdlab/setup-haxe@v1
605+
with:
606+
haxe-version: 4.2.5
607+
608+
- name: Set HAXEPATH
600609
run: |
601-
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
610+
echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV
611+
612+
- name: Install Haxe dependencies
613+
run: |
614+
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
602615
603616
- uses: actions/download-artifact@v3
604617
with:
@@ -637,6 +650,7 @@ jobs:
637650
638651
- name: Install Haxe dependencies
639652
run: |
653+
haxelib install genes --quiet
640654
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
641655
642656
- uses: actions/download-artifact@v3
@@ -661,6 +675,18 @@ jobs:
661675
lime build SimpleImage html5 -release -verbose -nocolor
662676
lime build SimpleAudio html5 -release -verbose -nocolor
663677
678+
- name: Build Lime samples with Genes
679+
run: |
680+
lime build HelloWorld html5 -clean -release -verbose -nocolor --haxelib=genes
681+
lime build SimpleImage html5 -clean -release -verbose -nocolor --haxelib=genes
682+
lime build SimpleAudio html5 -clean -release -verbose -nocolor --haxelib=genes
683+
684+
- name: Build Lime samples with Terser minification
685+
run: |
686+
lime build HelloWorld html5 -clean -release -verbose -nocolor -minify -terser
687+
lime build SimpleImage html5 -clean -release -verbose -nocolor -minify -terser
688+
lime build SimpleAudio html5 -clean -release -verbose -nocolor -minify -terser
689+
664690
ios-samples:
665691
needs: package-haxelib
666692
runs-on: macos-11
@@ -676,7 +702,7 @@ jobs:
676702
677703
- name: Install Haxe dependencies
678704
run: |
679-
haxelib install hxcpp --quiet
705+
haxelib install hxcpp 4.2.1 --quiet
680706
haxelib install format --quiet
681707
haxelib install hxp --quiet
682708
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
@@ -727,7 +753,7 @@ jobs:
727753
728754
- name: Install Haxe dependencies
729755
run: |
730-
haxelib install hxcpp --quiet
756+
haxelib install hxcpp 4.2.1 --quiet
731757
haxelib install format --quiet
732758
haxelib install hxp --quiet
733759
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
@@ -773,7 +799,7 @@ jobs:
773799
774800
- name: Install Haxe dependencies
775801
run: |
776-
haxelib install hxcpp --quiet
802+
haxelib install hxcpp 4.2.1 --quiet
777803
haxelib install format --quiet
778804
haxelib install hxp --quiet
779805
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
@@ -806,49 +832,24 @@ jobs:
806832
807833
neko-samples:
808834
needs: package-haxelib
835+
runs-on: ubuntu-20.04
809836
strategy:
810837
matrix:
811-
os: [ubuntu-20.04, macos-11, windows-latest]
812-
runs-on: ${{ matrix.os }}
838+
haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.1]
813839
steps:
814840

815841
- uses: krdlab/setup-haxe@v1
816842
with:
817-
haxe-version: 4.2.5
818-
819-
- name: Set HAXEPATH (Windows)
820-
if: ${{ startsWith(matrix.os, 'windows-') }}
821-
run: |
822-
echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV
843+
haxe-version: ${{ matrix.haxe-version }}
823844

824-
- name: Set HAXEPATH (macOS/Linux)
825-
if: ${{ !startsWith(matrix.os, 'windows-') }}
845+
- name: Set HAXEPATH
826846
run: |
827847
echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV
828848
829-
- name: Install system dependencies (Linux)
830-
if: ${{ startsWith(matrix.os, 'ubuntu-') }}
831-
run: |
832-
sudo apt-get update
833-
sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev
834-
835849
- name: Install Haxe dependencies
836850
run: |
837-
haxelib install hxcpp --quiet
838-
haxelib install format --quiet
839-
haxelib install hxp --quiet
840851
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
841852
842-
- name: Enable HXCPP compile cache (Windows)
843-
if: ${{ startsWith(matrix.os, 'windows-') }}
844-
run: |
845-
echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $Env:GITHUB_ENV
846-
847-
- name: Enable HXCPP compile cache (macOS/Linux)
848-
if: ${{ !startsWith(matrix.os, 'windows-') }}
849-
run: |
850-
echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
851-
852853
- uses: actions/download-artifact@v3
853854
with:
854855
name: lime-haxelib
@@ -886,7 +887,7 @@ jobs:
886887
887888
- name: Install Haxe dependencies
888889
run: |
889-
haxelib install hxcpp --quiet
890+
haxelib install hxcpp 4.2.1 --quiet
890891
haxelib install format --quiet
891892
haxelib install hxp --quiet
892893
haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
@@ -919,7 +920,7 @@ jobs:
919920
920921
notify:
921922
runs-on: ubuntu-20.04
922-
needs: [package-haxelib, docs, android-samples, flash-samples, hashlink-samples, html5-samples, ios-samples, linux-samples, macos-samples, neko-samples, windows-samples]
923+
needs: [package-haxelib, docs, android-samples, flash-samples, air-samples, hashlink-samples, html5-samples, ios-samples, linux-samples, macos-samples, neko-samples, windows-samples]
923924
if: ${{ github.repository == 'openfl/lime' && github.event_name != 'pull_request' }}
924925
steps:
925926
- name: Notify Discord

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
shallow = true
4545
[submodule "project/lib/cairo"]
4646
path = project/lib/cairo
47-
url = https://github.com/freedesktop/cairo
47+
url = https://gitlab.freedesktop.org/cairo/cairo.git
4848
shallow = true
4949
[submodule "project/lib/pixman"]
5050
path = project/lib/pixman
51-
url = https://github.com/freedesktop/pixman
51+
url = https://gitlab.freedesktop.org/pixman/pixman.git
5252
shallow = true
5353
[submodule "project/lib/lzma"]
5454
path = project/lib/lzma

0 commit comments

Comments
 (0)