Merge pull request #110 from dacmot/new_update_script

New update script

.gitmodules

@@ -59,7 +59,7 @@
 	path = builder/mods_src/decor/unifieddyes
 	url = https://github.com/mt-mods/unifieddyes
 [submodule "builder/mods_src/flight"]
-	path = builder/mods_src/flight
+	path = builder/mods_src/tools/flight
 	url = https://github.com/Amaz1/flight/
 [submodule "builder/mods_src/flora_ores/farming"]
 	path = builder/mods_src/flora_ores/farming
@@ -101,7 +101,7 @@
 	path = builder/mods_src/libs/intllib
 	url = https://github.com/minetest-mods/intllib
 [submodule "builder/mods_src/maidroid"]
-	path = builder/mods_src/maidroid
+	path = builder/mods_src/tools/maidroid
 	url = https://github.com/thePlasm/maidroid
 [submodule "builder/mods_src/mapgen/cloudlands"]
 	path = builder/mods_src/mapgen/cloudlands
@@ -116,10 +116,10 @@
 	path = builder/mods_src/mapgen/pbj_pup
 	url = https://notabug.org/TenPlus1/pbj_pup
 [submodule "builder/mods_src/mesecons"]
-	path = builder/mods_src/mesecons
+	path = builder/mods_src/mesecons/mesecons
 	url = https://github.com/minetest-mods/mesecons
 [submodule "builder/mods_src/minetest_game"]
-	path = builder/mods_src/minetest_game
+	path = builder/mods_src/minetest_game/minetest_game
 	url = https://github.com/minetest/minetest_game
 [submodule "builder/mods_src/mobs_redo/mobs_ghost_redo"]
 	path = builder/mods_src/mobs_redo/mobs_ghost_redo
@@ -131,7 +131,7 @@
 	path = builder/mods_src/mobs_redo/mobs_redo
 	url = https://notabug.org/TenPlus1/mobs_redo
 [submodule "builder/mods_src/mydoors"]
-	path = builder/mods_src/mydoors
+	path = builder/mods_src/decor/mydoors
 	url = https://github.com/minetest-mods/mydoors
 [submodule "builder/mods_src/player/awards"]
 	path = builder/mods_src/player/awards
@@ -212,22 +212,22 @@
 	path = builder/mods_src/tools/woodcutting
 	url = https://github.com/minetest-mods/woodcutting
 [submodule "builder/mods_src/smart_sfinv_modpack"]
-	path = builder/mods_src/smart_sfinv_modpack
+	path = builder/mods_src/player/smart_sfinv_modpack
 	url = https://github.com/bell07/minetest-smart_sfinv
 [submodule "builder/mods_src/3d_armor"]
-	path = builder/mods_src/3d_armor
+	path = builder/mods_src/player/3d_armor
 	url = https://github.com/minetest-mods/3d_armor
 [submodule "builder/mods_src/mapgen/tac_nayn"]
 	path = builder/mods_src/mapgen/tac_nayn
 	url = https://github.com/GreenXenith/tac_nayn
 [submodule "builder/mods_src/food_modpack"]
-	path = builder/mods_src/food_modpack
+	path = builder/mods_src/food/food_modpack
 	url = https://github.com/rubenwardy/food
 [submodule "builder/mods_src/homedecor_modpack"]
-	path = builder/mods_src/homedecor_modpack
+	path = builder/mods_src/decor/homedecor_modpack
 	url = https://github.com/mt-mods/homedecor_modpack
 [submodule "builder/mods_src/home_workshop_modpack"]
-	path = builder/mods_src/home_workshop_modpack
+	path = builder/mods_src/decor/home_workshop_modpack
 	url = https://github.com/mt-mods/home_workshop_modpack
 [submodule "builder/mods_src/player/skinsdb"]
 	path = builder/mods_src/player/skinsdb

builder/README.md

@@ -1,16 +1,37 @@
-# Builder scripts allow you to generate and update the game from source mods.
+# Development and Maintenance
 
+Builder scripts allow you to generate and update the game from source mods.
 
-# Let's start - Clone the repository
+## Let's start - Clone the repository
+
+```
 git clone --recurse-submodules https://github.com/minetest-whynot/whynot-game
+```
+
+## Update using build-mods.sh
 
-## If already cloned, update all mods
+```
 git pull --recurse-submodules
+```
 
-# Check if any included mod is not in last version
+Check if any included mod is not in last version
+
+```
 ./builder/check-updates.sh
+```
 
-All mods sources are stored in `builder/mods_src` folder, connected as submodules
+All mods sources are stored in `builder/mods_src` folder, connected as submodules. You can now update the whynot game
 
-# Build / Update the whynot game
+```
 ./builder/build-mods.sh
+```
+
+## Update using update_mod.sh
+
+If you wish to commit changes to the git repository, it may be more convenient to use the following :
+
+```
+./builder/update_mods.sh
+```
+
+This will go through each mods and prompt you to decide if you wish to view the changes (diff), merge them, and commit them.

builder/build-mods.sh

@@ -4,8 +4,15 @@ PROJ="$(realpath $(dirname $0)/..)"   # Absolute path
 SRC="$PROJ"/builder/mods_src/
 DST="$PROJ"/mods/            # Subgame mods
 LOG="$PROJ"/mod_sources.txt
+GIT="git --no-pager"
+GITPARAM="--color=always"
+RSYNC="rsync -a --info=NAME --delete --exclude=.git --exclude=.gitignore"
 
-source "$PROJ"/builder/build-whynot.lib
+export LC_ALL="C"
+
+! [ -e "$DST" ] && mkdir "$DST"
+
+source "$PROJ"/builder/lib-build-whynot.sh
 cd "$SRC" # for proper resolving the '*'
 
 # Remove old log
@@ -21,76 +28,77 @@ mod_install minetest_game --exclude=farming --exclude=env_sounds --exclude=mtg_c
 
 mod_install libs
 
-mod_install player
-
-mod_install player --exclude=3d_armor_ip --exclude=3d_armor_ui 3d_armor/*
-
-mod_install player smart_sfinv_modpack/*
+mod_install player --exclude=3d_armor --exclude=smart_sfinv_modpack
+mod_install player --exclude=3d_armor_ip --exclude=3d_armor_ui player/3d_armor/*
+mod_install player player/smart_sfinv_modpack/*
 
 mod_install ambience
 
 mod_install flora_ores
 mod_install mapgen
-mod_install tools
 
-mod_install tools flight/flyingcarpet
+mod_install tools --exclude=flight --exclude=maidroid
 
+mod_install tools flight/flyingcarpet
 mod_install tools maidroid/maidroid*
 
-mod_install decor
-mod_install decor homedecor_modpack/building_blocks #grate and marble in recipes
+mod_install decor --exclude=homedecor_modpack --exclude=home_workshop_modpack --exclude=mydoors
+
+mod_install decor decor/homedecor_modpack/building_blocks #grate and marble in recipes
 # no computers - I use laptop mod
-mod_install decor homedecor_modpack/fake_fire
+mod_install decor decor/homedecor_modpack/fake_fire
 # no inbox, itemframes
-mod_install decor homedecor_modpack/lavalamp
+mod_install decor decor/homedecor_modpack/lavalamp
 ## the homedecor blob was in whynot, therefore applied all at the first
 ## Next step is to check each mod for whynot rules
 # no 3d_extras
-mod_install decor homedecor_modpack/homedecor_bathroom
-mod_install decor homedecor_modpack/homedecor_bedroom
-mod_install decor homedecor_modpack/homedecor_books
-mod_install decor homedecor_modpack/homedecor_climate_control
-mod_install decor homedecor_modpack/homedecor_clocks
-mod_install decor homedecor_modpack/homedecor_cobweb
-mod_install decor homedecor_modpack/homedecor_common
-mod_install decor homedecor_modpack/homedecor_doors_and_gates
-mod_install decor homedecor_modpack/homedecor_electrical
-mod_install decor homedecor_modpack/homedecor_electronics
-mod_install decor homedecor_modpack/homedecor_exterior
-mod_install decor homedecor_modpack/homedecor_fences
-mod_install decor homedecor_modpack/homedecor_foyer
-mod_install decor homedecor_modpack/homedecor_furniture
-mod_install decor homedecor_modpack/homedecor_furniture_medieval
-mod_install decor homedecor_modpack/homedecor_gastronomy
-mod_install decor homedecor_modpack/homedecor_kitchen
-mod_install decor homedecor_modpack/homedecor_laundry
-mod_install decor homedecor_modpack/homedecor_lighting
-mod_install decor homedecor_modpack/homedecor_misc
-mod_install decor homedecor_modpack/homedecor_office
-mod_install decor homedecor_modpack/homedecor_pictures_and_paintings
-mod_install decor homedecor_modpack/homedecor_plasmascreen
-mod_install decor homedecor_modpack/homedecor_roofing
-mod_install decor homedecor_modpack/homedecor_seating
-mod_install decor homedecor_modpack/homedecor_tables
-mod_install decor homedecor_modpack/homedecor_trash_cans
-mod_install decor homedecor_modpack/homedecor_wardrobe
-mod_install decor homedecor_modpack/homedecor_windows_and_treatments
-
-mod_install decor home_workshop_modpack/home_vending_machines
-mod_install decor home_workshop_modpack/home_workshop_misc
-
-mod_install decor mydoors/my_castle_doors
-mod_install decor mydoors/my_cottage_doors
-mod_install decor mydoors/my_default_doors
-mod_install decor mydoors/my_door_wood
-mod_install decor mydoors/my_fancy_doors
-mod_install decor mydoors/my_future_doors
-mod_install decor mydoors/my_hidden_doors
-mod_install decor mydoors/my_misc_doors
-mod_install decor mydoors/my_old_doors
-mod_install decor mydoors/my_old_doors
-
-mod_install food food_modpack/food food_modpack/food_basic food/*
+mod_install decor decor/homedecor_modpack/homedecor_bathroom
+mod_install decor decor/homedecor_modpack/homedecor_bedroom
+mod_install decor decor/homedecor_modpack/homedecor_books
+mod_install decor decor/homedecor_modpack/homedecor_climate_control
+mod_install decor decor/homedecor_modpack/homedecor_clocks
+mod_install decor decor/homedecor_modpack/homedecor_cobweb
+mod_install decor decor/homedecor_modpack/homedecor_common
+mod_install decor decor/homedecor_modpack/homedecor_doors_and_gates
+mod_install decor decor/homedecor_modpack/homedecor_electrical
+mod_install decor decor/homedecor_modpack/homedecor_electronics
+mod_install decor decor/homedecor_modpack/homedecor_exterior
+mod_install decor decor/homedecor_modpack/homedecor_fences
+mod_install decor decor/homedecor_modpack/homedecor_foyer
+mod_install decor decor/homedecor_modpack/homedecor_furniture
+mod_install decor decor/homedecor_modpack/homedecor_furniture_medieval
+mod_install decor decor/homedecor_modpack/homedecor_gastronomy
+mod_install decor decor/homedecor_modpack/homedecor_kitchen
+mod_install decor decor/homedecor_modpack/homedecor_laundry
+mod_install decor decor/homedecor_modpack/homedecor_lighting
+mod_install decor decor/homedecor_modpack/homedecor_misc
+mod_install decor decor/homedecor_modpack/homedecor_office
+mod_install decor decor/homedecor_modpack/homedecor_pictures_and_paintings
+mod_install decor decor/homedecor_modpack/homedecor_plasmascreen
+mod_install decor decor/homedecor_modpack/homedecor_roofing
+mod_install decor decor/homedecor_modpack/homedecor_seating
+mod_install decor decor/homedecor_modpack/homedecor_tables
+mod_install decor decor/homedecor_modpack/homedecor_trash_cans
+mod_install decor decor/homedecor_modpack/homedecor_wardrobe
+mod_install decor decor/homedecor_modpack/homedecor_windows_and_treatments
+
+mod_install decor decor/home_workshop_modpack/home_vending_machines
+mod_install decor decor/home_workshop_modpack/home_workshop_misc
+
+mod_install decor decor/mydoors/my_castle_doors
+mod_install decor decor/mydoors/my_cottage_doors
+mod_install decor decor/mydoors/my_default_doors
+mod_install decor decor/mydoors/my_door_wood
+mod_install decor decor/mydoors/my_fancy_doors
+mod_install decor decor/mydoors/my_future_doors
+mod_install decor decor/mydoors/my_hidden_doors
+mod_install decor decor/mydoors/my_misc_doors
+mod_install decor decor/mydoors/my_old_doors
+mod_install decor decor/mydoors/my_old_doors
+
+mod_install food --exclude=food_modpack
+
+mod_install food food/food_modpack/food food/food_modpack/food_basic
 
 mod_install mesecons --exclude=mesecons_lucacontroller \
 					--exclude=mesecons_commandblock \
@@ -101,6 +109,6 @@ mod_install mesecons --exclude=mesecons_lucacontroller \
 					--exclude=mesecons_luacontroller \
 					--exclude=mesecons_microcontroller \
 					--exclude=mesecons_stickyblocks \
-			mesecons/*
+			mesecons/mesecons/*
 
 mod_install mobs_redo mobs_redo/*