Merge remote-tracking branch 'upstream/development' into fix/initialize-template-failing
This commit is contained in:
		
						commit
						e59547fcb9
					
				
							
								
								
									
										7
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							|  | @ -18,3 +18,10 @@ build.zip | ||||||
| 
 | 
 | ||||||
| # general-purpose cache folder (used by e.g clangd) | # general-purpose cache folder (used by e.g clangd) | ||||||
| .cache | .cache | ||||||
|  | *.o | ||||||
|  | compile_commands.json | ||||||
|  | .tree.hash | ||||||
|  | .cache | ||||||
|  | .kdev4 | ||||||
|  | *.kdev4 | ||||||
|  | *__pycache__ | ||||||
|  |  | ||||||
							
								
								
									
										12
									
								
								justfile
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								justfile
									
									
									
									
									
								
							|  | @ -1,10 +1,12 @@ | ||||||
| set export
 | set export
 | ||||||
| 
 | 
 | ||||||
| BUILD_NAME := "change_me" | BUILD_NAME := "change_me" | ||||||
|  | tree_hash := `tree ./modules | md5sum` | ||||||
|  | compiledb := if tree_hash == `cat .tree.hash` { "no" } else { "yes" } | ||||||
| 
 | 
 | ||||||
| build: format | build: format | ||||||
|     # Compiling Editor |     # Compiling Editor | ||||||
|     cd engine/ && scons target=editor symbols=yes optimization=debug dev_build=yes linker=mold use_llvm=yes compiledb=yes custom_modules="../modules" |     cd engine/ && scons target=editor symbols=yes optimization=debug dev_build=yes linker=mold use_llvm=yes compiledb={{compiledb}} custom_modules="../modules" | ||||||
| 
 | 
 | ||||||
| run: build | run: build | ||||||
|     # Running Editor |     # Running Editor | ||||||
|  | @ -12,7 +14,7 @@ run: build | ||||||
| 
 | 
 | ||||||
| release-linux: build | release-linux: build | ||||||
|     # Compiling Linux Release |     # Compiling Linux Release | ||||||
|     cd engine/ && scons platform=linuxbsd target=template_release arch=x86_64 linker=mold use_llvm=yes compiledb=yes custom_modules="../modules" |     cd engine/ && scons platform=linuxbsd target=template_release arch=x86_64 linker=mold use_llvm=yes custom_modules="../modules" | ||||||
|     # Preparing Build Environment |     # Preparing Build Environment | ||||||
|     sed -i "s!templatepath!{{`realpath engine/bin/godot.linuxbsd.template_release.x86_64.llvm`}}!" project/export_presets.cfg |     sed -i "s!templatepath!{{`realpath engine/bin/godot.linuxbsd.template_release.x86_64.llvm`}}!" project/export_presets.cfg | ||||||
|     rm -rf build && mkdir build |     rm -rf build && mkdir build | ||||||
|  | @ -24,14 +26,14 @@ release-linux: build | ||||||
| 
 | 
 | ||||||
| release-windows: build | release-windows: build | ||||||
|     # Compiling Windows Release |     # Compiling Windows Release | ||||||
|     cd engine/ && scons platform=windows target=template_release arch=x86_64 linker=mold use_llvm=yes compiledb=yes custom_modules="../modules" |     cd engine/ && scons platform=windows target=template_release arch=x86_64 linker=mold custom_modules="../modules" | ||||||
|     # Preparing Build Environment |     # Preparing Build Environment | ||||||
|     sed -i "s!templatepath!{{`realpath engine/bin/godot.windows.template_release.x86_64.llvm`}}!" project/export_presets.cfg |     sed -i "s!templatepath!{{`realpath engine/bin/godot.windows.template_release.x86_64`}}!" project/export_presets.cfg | ||||||
|     rm -rf build && mkdir build |     rm -rf build && mkdir build | ||||||
|     engine/bin/godot.*.editor.dev.*.llvm --headless --export-release "Windows" project/project.godot && zip build.zip build/* |     engine/bin/godot.*.editor.dev.*.llvm --headless --export-release "Windows" project/project.godot && zip build.zip build/* | ||||||
|     # Resetting Build Environment |     # Resetting Build Environment | ||||||
|     touch build/.gitkeep |     touch build/.gitkeep | ||||||
|     sed -i "s!{{`realpath engine/bin/godot.windows.template_release.x86_64.llvm`}}!templatepath!" project/export_presets.cfg |     sed -i "s!{{`realpath engine/bin/godot.windows.template_release.x86_64`}}!templatepath!" project/export_presets.cfg | ||||||
|     # Completed Windows Release Build |     # Completed Windows Release Build | ||||||
| 
 | 
 | ||||||
| initialize-template projectname: | initialize-template projectname: | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Sara
						Sara