From 831cb1c8bc651a4ef4ee09bd7eb293540a8afe99 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 7 May 2021 16:24:05 +1200
Subject: [PATCH 1/5] Add Vircadia Web repo as a Git submodule
---
.gitmodules | 3 +++
vircadia-web | 1 +
2 files changed, 4 insertions(+)
create mode 100644 .gitmodules
create mode 160000 vircadia-web
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..0ccc26ca95
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vircadia-web"]
+ path = vircadia-web
+ url = https://github.com/vircadia/vircadia-web.git
diff --git a/vircadia-web b/vircadia-web
new file mode 160000
index 0000000000..d2e383cab8
--- /dev/null
+++ b/vircadia-web
@@ -0,0 +1 @@
+Subproject commit d2e383cab811018422433fe0d8f224e53e0506cf
From c29c1d020012cc3fb097cd9ebbe87fe08aeb96f5 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 7 May 2021 21:36:01 +1200
Subject: [PATCH 2/5] Include Vircadia Web app files in an IDE directory
---
CMakeLists.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b303ff2938..8d958721c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -280,6 +280,12 @@ GroupSources("scripts")
GroupSources("unpublishedScripts")
unset(JS_SRC)
+file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
+list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
+add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
+GroupSources("vircadia-web")
+unset(WEB_APP_SRC)
+
set_packaging_parameters()
# Locate the required Qt build on the filesystem
From b07851870549bf2fc14087b3da23b3545eecb302 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 7 May 2021 21:36:53 +1200
Subject: [PATCH 3/5] Include non-script files in JavaScript IDE directories
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d958721c2..77d0413690 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -274,7 +274,7 @@ add_custom_target(cmake SOURCES ${CMAKE_SRC})
GroupSources("cmake")
unset(CMAKE_SRC)
-file(GLOB_RECURSE JS_SRC scripts/*.js unpublishedScripts/*.js)
+file(GLOB_RECURSE JS_SRC scripts/*.* unpublishedScripts/*.*)
add_custom_target(js SOURCES ${JS_SRC})
GroupSources("scripts")
GroupSources("unpublishedScripts")
From 5f4a98597672bd380636589ab8886117767f2d8b Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 8 May 2021 09:19:12 +1200
Subject: [PATCH 4/5] Make submodule origin repo be relative to parent
---
.gitmodules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitmodules b/.gitmodules
index 0ccc26ca95..12e8d16c35 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "vircadia-web"]
path = vircadia-web
- url = https://github.com/vircadia/vircadia-web.git
+ url = ./vircadia-web.git
\ No newline at end of file
From e408483cdfbbb159516cd945541696b821873e64 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 8 May 2021 09:51:09 +1200
Subject: [PATCH 5/5] Fix submodule URL
---
.gitmodules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitmodules b/.gitmodules
index 12e8d16c35..c8cdef6d56 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "vircadia-web"]
path = vircadia-web
- url = ./vircadia-web.git
\ No newline at end of file
+ url = ../vircadia-web.git
\ No newline at end of file