From b9e19385af0b251da1ccd397e9f1a45c9e534e4f Mon Sep 17 00:00:00 2001
From: Alexey Chubukov <a.chubukov@cdnvideo.com>
Date: Sat, 11 Nov 2023 18:57:22 +0400
Subject: [PATCH] prepare to go avay from Makefile

---
 Makefile                               |  10 ++-
 patches/history_countries_ISR.patch    |  11 +++
 src/history/countries/ISR - Israel.txt | 120 -------------------------
 3 files changed, 18 insertions(+), 123 deletions(-)
 create mode 100644 patches/history_countries_ISR.patch
 delete mode 100644 src/history/countries/ISR - Israel.txt

diff --git a/Makefile b/Makefile
index faaff8c..29ef648 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,11 @@ all: patch/tree/map/definition.csv
 DESTDIR ?= install
 MODNAME ?= randchgs
 MODPATH ?= C:/Users/User/Documents/Paradox Interactive/Hearts of Iron IV/mod/randchgs
+nullstring :=
+space :=
+space +=
+replaceQuestionBySpace = $(subst ?,$(space),$1)
+replaceSpaceByQuestion = $(subst $(space),?,$1)
 
 # patch
 VANILLA_SRC ?= ../vanilla
@@ -10,13 +15,12 @@ patchwork/map/definition.csv: $(VANILLA_SRC)/map/definition.csv patches/map_defi
 	patch -u --binary -N -o $@ $^
 
 #build
-raw_requsites := src/*
-patched_requisites := patchwork/map/definition.csv
+patched_requisites := patchwork/map/definition.csv "patchwork/history/countries/ISR - Israel.txt"
 build: 
 	mkdir $@
 release: build/release.zip
 
-image/$(MODNAME): src/* $(patched_requisites)
+image/$(MODNAME): $(wildcard scr/%) patchwork/map/definition.csv 
 	mkdir -p $@
 	rsync -rv src/ $@/
 	rsync -rv patchwork/ $@/
diff --git a/patches/history_countries_ISR.patch b/patches/history_countries_ISR.patch
new file mode 100644
index 0000000..d6e35f6
--- /dev/null
+++ b/patches/history_countries_ISR.patch
@@ -0,0 +1,11 @@
+--- "../vanilla/history/countries/ISR - Israel.txt"	2023-11-11 18:15:37.409356975 +0400
++++ "src/history/countries/ISR - Israel.txt"	2023-11-08 21:39:45.261768497 +0400
+@@ -83,7 +82,7 @@
+ create_country_leader = {
+ 	name = "David Ben-Gurion"
+ 	desc = ""
+-	picture = GFX_portrait_David_Ben_Gurion
++	picture = GFX_portrait_David_Ben_Gurion_new
+ 	ideology = liberalism
+ 	traits = {
+ 		#
diff --git a/src/history/countries/ISR - Israel.txt b/src/history/countries/ISR - Israel.txt
deleted file mode 100644
index 3aff60f..0000000
--- a/src/history/countries/ISR - Israel.txt	
+++ /dev/null
@@ -1,120 +0,0 @@
-capital = 554
-
-# Starting tech
-set_technology = {
-	infantry_weapons = 1
-	fuel_silos = 1
-}
-if = {
-	limit = {
-		NOT = {
-			has_dlc = "No Step Back"
-		}
-	}
-	set_technology = {
-		gwtank = 1
-	}
-}
-
-set_convoys = 5
-
-1939.1.1 = {
-
-	add_political_power = 1198
-	add_command_power = 100
-	
-	#generic focuses
-	complete_national_focus = army_effort
-	complete_national_focus = equipment_effort
-	complete_national_focus = motorization_effort
-	complete_national_focus = aviation_effort
-	complete_national_focus = naval_effort
-	complete_national_focus = large_navy
-	complete_national_focus = industrial_effort
-	complete_national_focus = construction_effort
-	complete_national_focus = production_effort
-	
-	set_technology = {
-		tech_support = 1
-		tech_recon = 1
-		support_weapons = 1
-		gw_artillery = 1
-
-		#doctrines
-		air_superiority = 1
-		grand_battle_plan = 1
-		trench_warfare = 1
-		fleet_in_being = 1
-		battlefleet_concentration = 1
-		convoy_sailing = 1
-
-		#electronics
-		electronic_mechanical_engineering = 1
-		radio = 1
-		radio_detection = 1
-		mechanical_computing = 1
-		computing_machine = 1
-
-		#industry
-		basic_machine_tools = 1
-		improved_machine_tools = 1
-		advanced_machine_tools = 1
-		fuel_refining = 1
-		construction1 = 1
-		construction2 = 1
-		dispersed_industry = 1
-		dispersed_industry2 = 1
-	}
-}
-
-
-set_politics = {
-	ruling_party = democratic
-	last_election = "1936.1.1"
-	election_frequency = 48
-	elections_allowed = yes
-}
-set_popularities = {
-	democratic = 80
-	communism = 20
-}
-
-create_country_leader = {
-	name = "David Ben-Gurion"
-	desc = ""
-	picture = GFX_portrait_David_Ben_Gurion_new
-	ideology = liberalism
-	traits = {
-		#
-	}
-}
-
-create_country_leader = {
-	name = "Itzhak Gaster"
-	desc = ""
-	picture = GFX_portrait_Itzhak_Gaster
-	ideology = fascism_ideology
-	traits = {
-		#
-	}
-}
-
-create_country_leader = {
-	name = "Rudolf Szabó"
-	desc = ""
-	picture = GFX_portrait_Rudolf_Szabo
-	ideology = despotism
-	traits = {
-		#
-	}
-}
-
-create_country_leader = {
-	name = "Shmuel Mikunis"
-	desc = ""
-	picture = GFX_portrait_Shmuel_Mikunis
-	ideology = leninism
-	traits = {
-		#
-	}
-}