Merge pull request #49 from CapsCollective/feature/scripts-cleanup

Cleaned up scripts and introduced shallow cloning for setup dependencies

Author: jonjondev

.github/workflows/windows.yml

@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: perform setup
-      run: ./scripts/Setup.ps1
+      run: ./scripts/setup.ps1
 
     - name: build all targets
       run: mingw32-make

Makefile

@@ -18,15 +18,13 @@ endif
 # Set platform vars
 ifeq ($(platform), windows)
     linkFlags += -Wl,--allow-multiple-definition -pthread -lopengl32 -lgdi32 -lwinmm -mwindows -static -static-libgcc -static-libstdc++
-    export packageScript = $(scriptsDir)/package.bat
+    export packageScript = powershell -executionpolicy bypass $(scriptsDir)/package.ps1 --pkg-name $1 --exe-name $2 --output-dir $3 --build-dir $4 $5
 else ifeq ($(platform), linux)
     linkFlags += -Wl,--no-as-needed -ldl -lpthread -lX11 -lXxf86vm -lXrandr -lXi -no-pie
     formatScript = $(scriptsDir)/format.sh
-    export packageScript = $(scriptsDir)/package.sh
 else ifeq ($(platform), macos)
     linkFlags += -framework CoreVideo -framework IOKit -framework Cocoa -framework GLUT -framework OpenGL
     formatScript = $(scriptsDir)/format.sh
-    export packageScript = $(scriptsDir)/package.sh
 endif
 
 # Set directories
@@ -93,7 +91,7 @@ package-renderapp: renderapp
 
 # Check to invalidate the build if flags have changed
 buildFlags:
-	$(BUILD_FLAGS_SCRIPT) $(buildFlagsFile) "$(CXXFLAGS)" "$(libDir) $(binDir)"
+	$(call BUILD_FLAGS_SCRIPT, $(buildFlagsFile), $(CXXFLAGS), $(libDir) $(binDir))
 
 # Run cleanup across project
 clean:

README.md

@@ -89,7 +89,7 @@ $ sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi
     ```
     ```console
     // Windows
-    > ./scripts/Setup.ps1
+    > ./scripts/setup.ps1
     ```
 
 3. This should install all required dependencies. Once completed a `.env` file will be generated with all required variables. If the build is completed with no issue then you can proceed to build the project.
@@ -104,7 +104,7 @@ $ ./scripts/setup.sh --include-validation-layers
 ```
 ```console
 // Windows
-> ./scripts/Setup.ps1 -Include_Validation_Layers
+> ./scripts/setup.ps1 -Include_Validation_Layers
 ```
 
 **NOTE**: Building with this option can take some time to complete. Please be patient while the project builds the required validation layers.

engine/core/Makefile

@@ -27,9 +27,7 @@ raylibLib := $(vendorDir)/raylib-cpp/vendor/raylib/$(libGenDir)/libraylib.a
 $(coreLib): $(raylibLib) $(raylibIncludeDir) $(coreObjects)
 	$(MKDIR) $(call platformpth, $(libDir))
 	$(RM) $(call platformpth, $(coreLib))
-	$(call COPY,$(vendorDir)/raylib-cpp/vendor/raylib/$(libGenDir),$(libDir),libraylib.a)
-	mv $(call platformpth,$(libDir)/libraylib.a) $(call platformpth,$(libDir)/libcore.a)
-	ar -rs $(coreLib) $(coreObjects)
+	$(call COMBINE_LIBS, $(vendorDir)/raylib-cpp/vendor/raylib/$(libGenDir)/libraylib.a, $(coreObjects), $(libDir), core)
 
 # Add all rules from dependency files
 -include $(coreDepends)
@@ -43,8 +41,8 @@ $(coreBinDir)/%.o: $(coreSrcDir)/%.cpp
 # Copy the relevant header files into includes
 $(raylibIncludeDir):
 	$(MKDIR) $(call platformpth, $(raylibIncludeDir)/raylib)
-	$(call COPY,$(vendorDir)/raylib-cpp/vendor/raylib/src,$(raylibIncludeDir)/raylib,raylib.h)
-	$(call COPY,$(vendorDir)/raylib-cpp/vendor/raylib/src,$(raylibIncludeDir)/raylib,raymath.h)
+	$(call COPY,$(vendorDir)/raylib-cpp/vendor/raylib/src,$(raylibIncludeDir)/raylib,raylib.h,**)
+	$(call COPY,$(vendorDir)/raylib-cpp/vendor/raylib/src,$(raylibIncludeDir)/raylib,raymath.h,**)
 	$(call COPY,$(vendorDir)/raylib-cpp/include,$(raylibIncludeDir)/raylib,*.hpp)
 
 # Build the raylib static library file

engine/render/Makefile

@@ -53,4 +53,4 @@ $(renderBuildDir)/assets/shaders/%.spv: $(renderSrcDir)/assets/shaders/%
 # Copy Vulkan libraries to the build directory
 vulkan-libs:
 	$(MKDIR) $(call platformpth, $(renderBuildDir)/lib)
-	$(call COPY_DIR,$(vendorDir)/vulkan/lib,$(renderBuildDir)/lib)
+	$(call COPY,$(vendorDir)/vulkan/lib,$(renderBuildDir)/lib,**)

examples/game/Makefile

@@ -44,4 +44,4 @@ game-assets:
 # Package the built application and all its assets to the output directory
 package: all
 	$(RM) $(call platformpth,$(outputDir)/$(exampleGameOutputName))
-	$(packageScript) $(exampleGameOutputName) $(shell basename $(exampleGameApp)) $(outputDir) $(exampleGameBuildDir)
+	$(call PACKAGE_SCRIPT, $(exampleGameOutputName), $(shell basename $(exampleGameApp)), $(outputDir), $(exampleGameBuildDir))

examples/render/Makefile

@@ -63,11 +63,11 @@ $(exampleRenderBinDir)/%.o: $(exampleRenderSrcDir)/%.cpp
 # Copy assets (and other required build files) directory to the build directory
 render-assets:
 	$(MKDIR) $(call platformpth,$(exampleRenderBuildDir))
-	$(call COPY_DIR,$(binDir)/engine/render/build,$(exampleRenderBuildDir))
+	$(call COPY,$(binDir)/engine/render/build,$(exampleRenderBuildDir),**)
 	$(MKDIR) $(call platformpth,$(exampleRenderBuildDir)/assets)
-	$(call COPY_DIR,$(exampleRenderSrcDir)/assets,$(exampleRenderBuildDir)/assets)
+	$(call COPY,$(exampleRenderSrcDir)/assets,$(exampleRenderBuildDir)/assets,**)
 
 # Package the built application and all its assets to the output directory
 package:
 	$(RM) "$(outputDir)/$(exampleRenderOutputName)"
-	$(packageScript) $(exampleRenderOutputName) $(shell basename $(exampleRenderApp)) $(outputDir) $(exampleRenderBuildDir) $(packagingFlags)
+	$(call PACKAGE_SCRIPT, $(exampleRenderOutputName), $(shell basename $(exampleRenderApp)), $(outputDir), $(exampleRenderBuildDir), $(packagingFlags))

make/Platform.mk

@@ -11,17 +11,17 @@ ifeq ($(OS), Windows_NT)
 	CXX ?= g++
 	THEN := &&
 	PATHSEP := \$(BLANK)
-	MKDIR = $(scriptsDir)/mkdir.bat
+	MKDIR = powershell -executionpolicy bypass $(scriptsDir)/mkdir.ps1
 	RM := rm -r -f
 	EXE_NAME := .exe
 	VOLK_OS := WIN32_KHR
-	COPY = $(scriptsDir)/copy.bat $1 $2 $3
-	COPY_DIR = $(scriptsDir)/copy.bat --copy-directory $1 $2
+	COPY = powershell -executionpolicy bypass $(scriptsDir)/copy.ps1 $1 $2 $3
 	VALIDATION_LAYERS_INSTALL_DIR := explicit_layer.d
-	BUILD_FLAGS_SCRIPT = $(scriptsDir)/buildFlags.bat
-	COMBINE_LIBS = powershell $(scriptsDir)/Combine-Libs.ps1 --src_libs $1 --src_objs $2 --output_dir $3 --output_name $4
+	BUILD_FLAGS_SCRIPT = powershell -executionpolicy bypass $(scriptsDir)/buildflags.ps1 --Target $1 --CXXFlags $2 --Dirs $3
+	COMBINE_LIBS = powershell -executionpolicy bypass $(scriptsDir)/combinelibs.ps1 --src_libs $1 --src_objs $2 --output_dir $3 --output_name $4
+	PACKAGE_SCRIPT = powershell -executionpolicy bypass $(scriptsDir)/package.ps1 --pkg-name $1 --exe-name $2 --output-dir $3 --build-dir $4 $5
 else
-	COMBINE_LIBS = $(scriptsDir)/combine-libs.sh --src_libs $1 --src_objs $2 --output_dir $3 --output_name $4
+	COMBINE_LIBS = $(scriptsDir)/combinelibs.sh --src_libs $1 --src_objs $2 --output_dir $3 --output_name $4
 	# Check for MacOS/Linux
 	UNAMEOS := $(shell uname)
 	ifeq ($(UNAMEOS), Linux)
@@ -45,5 +45,6 @@ else
 	COPY = cp -r $1$(PATHSEP)$3 $2
 	COPY_DIR = $(call COPY,$1,$2,$3)
 	VALIDATION_LAYERS_INSTALL_DIR := lib/explicit_layer.d
-	BUILD_FLAGS_SCRIPT = $(scriptsDir)/buildFlags.sh
+	BUILD_FLAGS_SCRIPT = $(scriptsDir)/buildflags.sh $1 "$2" "$3"
+	PACKAGE_SCRIPT = $(scriptsDir)/package.sh $1 $2 $3 $4 $5
 endif

scripts/applyenv.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+#
 # Copyright (c) 2022 Jonathan Moallem (@J-Mo63) & Aryeh Zinn (@Raelr)
 #
 # This code is released under an unmodified zlib license.