Skip to content

Commit a1ae6b6

Browse files
rgerdrgerd
authored
Move BabylonNative UWP build out of submodule (#200)
* Move BabylonNative build out of submodule * Update package lock checksums for local modules
1 parent 7077d58 commit a1ae6b6

File tree

7 files changed

+36
-36
lines changed

7 files changed

+36
-36
lines changed

‎Apps/PackageTest/0.63.1/package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Apps/PackageTest/0.64.0/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
</PropertyGroup>
3030
<PropertyGroup Label="BabylonReactNativeProps">
3131
<BabylonReactNativeDir Condition="'$(BabylonReactNativeDir)' == '' And Exists('$(ProjectDir)\..\..\..\react-native')">$(ProjectDir)\..\..\..\react-native</BabylonReactNativeDir>
32-
<BabylonNativeDir Condition="Exists('$(BabylonReactNativeDir)\submodules\BabylonNative')">$(BabylonReactNativeDir)\submodules\BabylonNative</BabylonNativeDir>
33-
<BabylonNativeBuildDir Condition="'$(Platform)'=='x64' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\Build_uwp_x64\</BabylonNativeBuildDir>
34-
<BabylonNativeBuildDir Condition="'$(Platform)'=='Win32' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\Build_uwp_x86\</BabylonNativeBuildDir>
35-
<BabylonNativeBuildDir Condition="'$(Platform)'=='ARM' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\Build_uwp_arm\</BabylonNativeBuildDir>
36-
<BabylonNativeBuildDir Condition="'$(Platform)'=='ARM64' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\Build_uwp_arm64\</BabylonNativeBuildDir>
32+
<BabylonNativeDir Condition="Exists('$(BabylonReactNativeDir)\submodules\BabylonNative')">$(BabylonReactNativeDir)\Build</BabylonNativeDir>
33+
<BabylonNativeBuildDir Condition="'$(Platform)'=='x64' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\uwp_x64\</BabylonNativeBuildDir>
34+
<BabylonNativeBuildDir Condition="'$(Platform)'=='Win32' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\uwp_x86\</BabylonNativeBuildDir>
35+
<BabylonNativeBuildDir Condition="'$(Platform)'=='ARM' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\uwp_arm\</BabylonNativeBuildDir>
36+
<BabylonNativeBuildDir Condition="'$(Platform)'=='ARM64' And '$(BabylonNativeDir)' != ''">$(BabylonNativeDir)\uwp_arm64\</BabylonNativeBuildDir>
3737
<BabylonNativeLibsDir Condition="'$(Platform)'=='x64' And '$(BabylonNativeDir)' == ''">..\libs\x64\</BabylonNativeLibsDir>
3838
<BabylonNativeLibsDir Condition="'$(Platform)'=='Win32' And '$(BabylonNativeDir)' == ''">..\libs\x86\</BabylonNativeLibsDir>
3939
<BabylonNativeLibsDir Condition="'$(Platform)'=='ARM' And '$(BabylonNativeDir)' == ''">..\libs\arm\</BabylonNativeLibsDir>

‎Modules/@babylonjs/react-native-windows/windows/scripts/Build.ps1‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ if ((!$Platform -And $Configuration) -Or
1414
}
1515

1616
if (!$Platform -And !$Configuration) {
17-
Compile-Solution -Platform "Win32" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\Build_uwp_x86\ReactNativeBabylon.sln"
18-
Compile-Solution -Platform "Win32" -Configuration "Release" -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\Build_uwp_x86\ReactNativeBabylon.sln"
19-
Compile-Solution -Platform "x64" -Configuration "Release" -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\Build_uwp_x64\ReactNativeBabylon.sln"
20-
Compile-Solution -Platform "x64" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\Build_uwp_x64\ReactNativeBabylon.sln"
21-
Compile-Solution -Platform "ARM" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\Build_uwp_arm\ReactNativeBabylon.sln"
22-
Compile-Solution -Platform "ARM" -Configuration "Release" -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\Build_uwp_arm\ReactNativeBabylon.sln"
23-
Compile-Solution -Platform "ARM64" -Configuration "Release" -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\Build_uwp_arm64\ReactNativeBabylon.sln"
24-
Compile-Solution -Platform "ARM64" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\Build_uwp_arm64\ReactNativeBabylon.sln"
17+
Compile-Solution -Platform "Win32" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\Build\uwp_x86\ReactNativeBabylon.sln"
18+
Compile-Solution -Platform "Win32" -Configuration "Release" -Solution "$PSScriptRoot\..\..\..\react-native\Build\uwp_x86\ReactNativeBabylon.sln"
19+
Compile-Solution -Platform "x64" -Configuration "Release" -Solution "$PSScriptRoot\..\..\..\react-native\Build\uwp_x64\ReactNativeBabylon.sln"
20+
Compile-Solution -Platform "x64" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\Build\uwp_x64\ReactNativeBabylon.sln"
21+
Compile-Solution -Platform "ARM" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\Build\uwp_arm\ReactNativeBabylon.sln"
22+
Compile-Solution -Platform "ARM" -Configuration "Release" -Solution "$PSScriptRoot\..\..\..\react-native\Build\uwp_arm\ReactNativeBabylon.sln"
23+
Compile-Solution -Platform "ARM64" -Configuration "Release" -Solution "$PSScriptRoot\..\..\..\react-native\Build\uwp_arm64\ReactNativeBabylon.sln"
24+
Compile-Solution -Platform "ARM64" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\Build\uwp_arm64\ReactNativeBabylon.sln"
2525
}
2626
else {
27-
$DirectoryMap = @{ "Win32"="Build_uwp_x86"; "x64" = "Build_uwp_x64"; "ARM"="Build_uwp_arm"; "ARM64"="Build_uwp_arm64"; };
27+
$DirectoryMap = @{ "Win32"="uwp_x86"; "x64" = "uwp_x64"; "ARM"="uwp_arm"; "ARM64"="uwp_arm64"; };
2828
$Directory = $DirectoryMap[$Platform];
29-
Compile-Solution -Platform $Platform -Configuration $Configuration -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\$Directory\ReactNativeBabylon.sln"
29+
Compile-Solution -Platform $Platform -Configuration $Configuration -Solution "$PSScriptRoot\..\..\..\react-native\Build\$Directory\ReactNativeBabylon.sln"
3030
}
3131

‎Modules/@babylonjs/react-native-windows/windows/scripts/PRBuild.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Import-Module $PSScriptRoot\Utils.psm1
22

3-
Compile-Solution -Platform "x64" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\submodules\BabylonNative\Build_uwp_x64\ReactNativeBabylon.sln"
3+
Compile-Solution -Platform "x64" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\react-native\Build\uwp_x64\ReactNativeBabylon.sln"
44
nuget restore "$PSScriptRoot\..\..\..\..\..\Apps\Playground\windows\Playground.sln"
55
Compile-Solution -Platform "x64" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\..\..\Apps\Playground\windows\Playground.sln"

‎Modules/@babylonjs/react-native-windows/windows/scripts/Utils.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function Restore-CMakeProject {
3636

3737
Write-Host "Running cmake for $Platform dependencies" -ForegroundColor Cyan
3838

39-
$BuildDir = "$PSScriptRoot\..\..\submodules\BabylonNative\Build_uwp_$Platform"
39+
$BuildDir = "$PSScriptRoot\..\..\Build\uwp_$Platform"
4040
if (!(Test-Path $BuildDir)) {
4141
mkdir $BuildDir
4242
}

‎Package/gulpfile.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,23 @@ const initializeSubmodulesWindowsAgent = async () => {
5353
}
5454

5555
const makeUWPProjectx86 = async () => {
56-
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x86');
57-
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A Win32 ./../../../../react-native-windows/windows', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x86');
56+
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/Build/uwp_x86');
57+
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A Win32 ./../../../react-native-windows/windows', './../Modules/@babylonjs/react-native/Build/uwp_x86');
5858
}
5959

6060
const makeUWPProjectx64 = async () => {
61-
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x64');
62-
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI ./../../../../react-native-windows/windows', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x64');
61+
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/Build/uwp_x64');
62+
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI ./../../../react-native-windows/windows', './../Modules/@babylonjs/react-native/Build/uwp_x64');
6363
}
6464

6565
const makeUWPProjectARM = async () => {
66-
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm');
67-
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A arm ./../../../../react-native-windows/windows', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm');
66+
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/Build/uwp_arm');
67+
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A arm ./../../../react-native-windows/windows', './../Modules/@babylonjs/react-native/Build/uwp_arm');
6868
}
6969

7070
const makeUWPProjectARM64 = async () => {
71-
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm64');
72-
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A arm64 ./../../../../react-native-windows/windows', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm64');
71+
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/Build/uwp_arm64');
72+
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A arm64 ./../../../react-native-windows/windows', './../Modules/@babylonjs/react-native/Build/uwp_arm64');
7373
}
7474

7575
const makeUWPProject = gulp.parallel(
@@ -252,49 +252,49 @@ const copyCommonFilesUWP = () => {
252252
}
253253

254254
const copyx86DebugUWPFiles = () => {
255-
return gulp.src('../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x86/**/Debug/**/*.{lib,pri}')
255+
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_x86/**/Debug/**/*.{lib,pri}')
256256
.pipe(rename({ dirname: '' }))
257257
.pipe(gulp.dest('Assembled-Windows/windows/libs/x86/Debug'));
258258
}
259259

260260
const copyx86ReleaseUWPFiles = () => {
261-
return gulp.src('../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x86/**/Release/**/*.{lib,pri}')
261+
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_x86/**/Release/**/*.{lib,pri}')
262262
.pipe(rename({ dirname: '' }))
263263
.pipe(gulp.dest('Assembled-Windows/windows/libs/x86/Release'));
264264
}
265265

266266
const copyx64DebugUWPFiles = () => {
267-
return gulp.src('../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x64/**/Debug/**/*.{lib,pri}')
267+
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_x64/**/Debug/**/*.{lib,pri}')
268268
.pipe(rename({ dirname: '' }))
269269
.pipe(gulp.dest('Assembled-Windows/windows/libs/x64/Debug'));
270270
}
271271

272272
const copyx64ReleaseUWPFiles = () => {
273-
return gulp.src('../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x64/**/Release/**/*.{lib,pri}')
273+
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_x64/**/Release/**/*.{lib,pri}')
274274
.pipe(rename({ dirname: '' }))
275275
.pipe(gulp.dest('Assembled-Windows/windows/libs/x64/Release'));
276276
}
277277

278278
const copyARMDebugUWPFiles = () => {
279-
return gulp.src('../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm/**/Debug/**/*.{lib,pri}')
279+
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_arm/**/Debug/**/*.{lib,pri}')
280280
.pipe(rename({ dirname: '' }))
281281
.pipe(gulp.dest('Assembled-Windows/windows/libs/arm/Debug'));
282282
}
283283

284284
const copyARMReleaseUWPFiles = () => {
285-
return gulp.src('../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm/**/Release/**/*.{lib,pri}')
285+
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_arm/**/Release/**/*.{lib,pri}')
286286
.pipe(rename({ dirname: '' }))
287287
.pipe(gulp.dest('Assembled-Windows/windows/libs/arm/Release'));
288288
}
289289

290290
const copyARM64DebugUWPFiles = () => {
291-
return gulp.src('../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm64/**/Debug/**/*.{lib,pri}')
291+
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_arm64/**/Debug/**/*.{lib,pri}')
292292
.pipe(rename({ dirname: '' }))
293293
.pipe(gulp.dest('Assembled-Windows/windows/libs/arm64/Debug'));
294294
}
295295

296296
const copyARM64ReleaseUWPFiles = () => {
297-
return gulp.src('../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm64/**/Release/**/*.{lib,pri}')
297+
return gulp.src('../Modules/@babylonjs/react-native/Build/uwp_arm64/**/Release/**/*.{lib,pri}')
298298
.pipe(rename({ dirname: '' }))
299299
.pipe(gulp.dest('Assembled-Windows/windows/libs/arm64/Release'));
300300
}

0 commit comments

Comments
 (0)