Skip to content

Commit 8ede856

Browse files
Remove arm32 for UWP (#635)
1 parent fbc087c commit 8ede856

File tree

2 files changed

+1
-47
lines changed

2 files changed

+1
-47
lines changed

.github/workflows/bn_master_commit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
runs-on: windows-2019
7878
strategy:
7979
matrix:
80-
platform: [x86, x64, ARM, ARM64]
80+
platform: [x86, x64, ARM64]
8181
config: [Debug, Release]
8282
steps:
8383
- name: Checkout Repo

Package/gulpfile.js

-46
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,11 @@ const makeUWPProjectPlatform = async (name, arch) => {
100100

101101
const makeUWPProjectx86 = async () => makeUWPProjectPlatform('x86', 'Win32');
102102
const makeUWPProjectx64 = async () => makeUWPProjectPlatform('x64', 'x64');
103-
const makeUWPProjectARM = async () => makeUWPProjectPlatform('arm', 'arm');
104103
const makeUWPProjectARM64 = async () => makeUWPProjectPlatform('arm64', 'arm64');
105104

106105
const makeUWPProject = gulp.parallel(
107106
makeUWPProjectx86,
108107
makeUWPProjectx64,
109-
makeUWPProjectARM,
110108
makeUWPProjectARM64
111109
);
112110

@@ -126,14 +124,6 @@ const buildUWPx64Release = async () => {
126124
exec('.\\..\\Modules\\@babylonjs\\react-native-windows\\windows\\scripts\\Build.bat -Platform x64 -Configuration Release');
127125
}
128126

129-
const buildUWPARMDebug = async () => {
130-
exec('.\\..\\Modules\\@babylonjs\\react-native-windows\\windows\\scripts\\Build.bat -Platform ARM -Configuration Debug');
131-
}
132-
133-
const buildUWPARMRelease = async () => {
134-
exec('.\\..\\Modules\\@babylonjs\\react-native-windows\\windows\\scripts\\Build.bat -Platform ARM -Configuration Release');
135-
}
136-
137127
const buildUWPARM64Debug = async () => {
138128
exec('.\\..\\Modules\\@babylonjs\\react-native-windows\\windows\\scripts\\Build.bat -Platform ARM64 -Configuration Debug');
139129
}
@@ -147,8 +137,6 @@ const buildUWPProject = gulp.parallel(
147137
buildUWPx86Release,
148138
buildUWPx64Debug,
149139
buildUWPx64Release,
150-
buildUWPARMDebug,
151-
buildUWPARMRelease,
152140
buildUWPARM64Debug,
153141
buildUWPARM64Release
154142
);
@@ -173,14 +161,6 @@ const buildUWPPlaygroundx64Release = async () => {
173161
exec('.\\..\\Modules\\@babylonjs\\react-native-windows\\windows\\scripts\\BuildPlayground.bat -Platform x64 -Configuration Release');
174162
}
175163

176-
const buildUWPPlaygroundARMDebug = async () => {
177-
exec('.\\..\\Modules\\@babylonjs\\react-native-windows\\windows\\scripts\\BuildPlayground.bat -Platform ARM -Configuration Debug');
178-
}
179-
180-
const buildUWPPlaygroundARMRelease = async () => {
181-
exec('.\\..\\Modules\\@babylonjs\\react-native-windows\\windows\\scripts\\BuildPlayground.bat -Platform ARM -Configuration Release');
182-
}
183-
184164
const buildUWPPlaygroundARM64Debug = async () => {
185165
exec('.\\..\\Modules\\@babylonjs\\react-native-windows\\windows\\scripts\\BuildPlayground.bat -Platform ARM64 -Configuration Debug');
186166
}
@@ -194,8 +174,6 @@ const buildUWPPlayground = gulp.parallel(
194174
buildUWPPlaygroundx86Release,
195175
buildUWPPlaygroundx64Debug,
196176
buildUWPPlaygroundx64Release,
197-
buildUWPPlaygroundARMDebug,
198-
buildUWPPlaygroundARMRelease,
199177
buildUWPPlaygroundARM64Debug,
200178
buildUWPPlaygroundARM64Release
201179
);
@@ -285,9 +263,6 @@ const createUWPDirectories = async () => {
285263
shelljs.mkdir('-p', `${assembledWindowsDir}`);
286264
shelljs.mkdir('-p', `${assembledWindowsDir}/windows`);
287265
shelljs.mkdir('-p', `${assembledWindowsDir}/windows/libs`);
288-
shelljs.mkdir('-p', `${assembledWindowsDir}/windows/libs/arm`);
289-
shelljs.mkdir('-p', `${assembledWindowsDir}/windows/libs/arm/Debug`);
290-
shelljs.mkdir('-p', `${assembledWindowsDir}/windows/libs/arm/Release`);
291266
shelljs.mkdir('-p', `${assembledWindowsDir}/windows/libs/arm64`);
292267
shelljs.mkdir('-p', `${assembledWindowsDir}/windows/libs/arm64/Debug`);
293268
shelljs.mkdir('-p', `${assembledWindowsDir}/windows/libs/arm64/Release`);
@@ -335,18 +310,6 @@ const copyx64ReleaseUWPFiles = () => {
335310
.pipe(gulp.dest(`${assembledWindowsDir}/windows/libs/x64/Release`));
336311
}
337312

338-
const copyARMDebugUWPFiles = () => {
339-
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_arm/**/Debug/**/*.{lib,pri}')
340-
.pipe(rename({ dirname: '' }))
341-
.pipe(gulp.dest(`${assembledWindowsDir}/windows/libs/arm/Debug`));
342-
}
343-
344-
const copyARMReleaseUWPFiles = () => {
345-
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_arm/**/Release/**/*.{lib,pri}')
346-
.pipe(rename({ dirname: '' }))
347-
.pipe(gulp.dest(`${assembledWindowsDir}/windows/libs/arm/Release`));
348-
}
349-
350313
const copyARM64DebugUWPFiles = () => {
351314
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_arm64/**/Debug/**/*.{lib,pri}')
352315
.pipe(rename({ dirname: '' }))
@@ -396,8 +359,6 @@ const copyUWPFiles = gulp.series(
396359
copyx86ReleaseUWPFiles,
397360
copyx64DebugUWPFiles,
398361
copyx64ReleaseUWPFiles,
399-
copyARMDebugUWPFiles,
400-
copyARMReleaseUWPFiles,
401362
copyARM64DebugUWPFiles,
402363
copyARM64ReleaseUWPFiles,
403364
copyVCXProjUWPFiles)
@@ -408,8 +369,6 @@ const copyUWPFiles = gulp.series(
408369
copyx86ReleaseUWPFiles,
409370
copyx64DebugUWPFiles,
410371
copyx64ReleaseUWPFiles,
411-
copyARMDebugUWPFiles,
412-
copyARMReleaseUWPFiles,
413372
copyARM64DebugUWPFiles,
414373
copyARM64ReleaseUWPFiles,
415374
copyVCXProjUWPFiles,
@@ -682,16 +641,13 @@ const packUWPNoBuild = gulp.series(clean, copyPackageFilesUWP, createPackage, cr
682641
exports.buildTS = buildTS;
683642
exports.makeUWPProjectx86 = makeUWPProjectx86;
684643
exports.makeUWPProjectx64 = makeUWPProjectx64;
685-
exports.makeUWPProjectARM = makeUWPProjectARM;
686644
exports.makeUWPProjectARM64 = makeUWPProjectARM64;
687645
exports.makeUWPProject = makeUWPProject;
688646

689647
exports.buildUWPx86Debug = buildUWPx86Debug;
690648
exports.buildUWPx86Release = buildUWPx86Release;
691649
exports.buildUWPx64Debug = buildUWPx64Debug;
692650
exports.buildUWPx64Release = buildUWPx64Release;
693-
exports.buildUWPARMDebug = buildUWPARMDebug;
694-
exports.buildUWPARMRelease = buildUWPARMRelease;
695651
exports.buildUWPARM64Debug = buildUWPARM64Debug;
696652
exports.buildUWPARM64Release = buildUWPARM64Release;
697653
exports.buildUWPProject = buildUWPProject;
@@ -701,8 +657,6 @@ exports.buildUWPPlaygroundx86Debug = buildUWPPlaygroundx86Debug;
701657
exports.buildUWPPlaygroundx86Release = buildUWPPlaygroundx86Release;
702658
exports.buildUWPPlaygroundx64Debug = buildUWPPlaygroundx64Debug;
703659
exports.buildUWPPlaygroundx64Release = buildUWPPlaygroundx64Release;
704-
exports.buildUWPPlaygroundARMDebug = buildUWPPlaygroundARMDebug;
705-
exports.buildUWPPlaygroundARMRelease = buildUWPPlaygroundARMRelease;
706660
exports.buildUWPPlaygroundARM64Debug = buildUWPPlaygroundARM64Debug;
707661
exports.buildUWPPlaygroundARM64Release = buildUWPPlaygroundARM64Release;
708662
exports.buildUWPPlayground = buildUWPPlayground;

0 commit comments

Comments
 (0)