Merge branch 'master' of github.com:ebrahimebrahim/knock-the-rock

ebrahimebrahim · Sep 30, 2020 · 612d0d8 · 612d0d8
2 parents 6b9c150 + 0b5f4a3
commit 612d0d8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/ktr/Globals.gd b/ktr/Globals.gd
@@ -7,10 +7,18 @@ func get_version_info():
 	if err == OK :
 		commit_hash = file.get_as_text().strip_edges()
 	file.close()
+
+	var version_number = "[version number error]"
+	err = file.open("res://version_number.txt", File.READ)
+	if err == OK :
+		version_number = file.get_as_text().strip_edges()
+	file.close()
+
+
 
 	return {
-		"version_number" : "1.0.0", # Edit the version number here!
-		"dev_or_release" : "dev",   # Edit here for release!
+		"version_number" : version_number,
+		"dev_or_release" : "dev",	 # Edit here for release!
 		"commit_hash" : commit_hash,
 	}
 

diff --git a/ktr/export_presets.cfg b/ktr/export_presets.cfg
@@ -5,7 +5,7 @@ platform="Linux/X11"
 runnable=true
 custom_features=""
 export_filter="all_resources"
-include_filter="commit_hash.txt"
+include_filter="commit_hash.txt, version_number.txt"
 exclude_filter="settings.tres"
 export_path="../exported/Knock the Rock.x86_64"
 patch_list=PoolStringArray(  )
@@ -31,7 +31,7 @@ platform="Windows Desktop"
 runnable=true
 custom_features=""
 export_filter="all_resources"
-include_filter="commit_hash.txt"
+include_filter="commit_hash.txt, version_number.txt"
 exclude_filter="settings.tres"
 export_path="../exported/Knock the Rock.exe"
 patch_list=PoolStringArray(  )
@@ -73,7 +73,7 @@ platform="Mac OSX"
 runnable=true
 custom_features=""
 export_filter="all_resources"
-include_filter="commit_hash.txt"
+include_filter="commit_hash.txt, version_number.txt"
 exclude_filter="settings.tres"
 export_path="../exported/Knock the Rock.zip"
 patch_list=PoolStringArray(  )

diff --git a/ktr/version_number.txt b/ktr/version_number.txt
@@ -0,0 +1 @@
+1.0.0
diff --git a/make.sh b/make.sh
@@ -47,6 +47,8 @@ mkdir $BUILD_DIR/$BUILD_SUBDIR_LIN
 mkdir $BUILD_DIR/$BUILD_SUBDIR_MAC
 
 $GODOT --path $GODOT_PROJECT_DIR --export "Linux/X11" "$BUILD_DIR_G/$BUILD_SUBDIR_LIN/$EXEC_LIN"
+cp ktr/icon.png $BUILD_DIR/$BUILD_SUBDIR_LIN
+
 $GODOT --path $GODOT_PROJECT_DIR --export "Mac OSX" "$BUILD_DIR_G/$BUILD_SUBDIR_MAC/$EXEC_MAC"
 $GODOT --path $GODOT_PROJECT_DIR --export "Windows Desktop" "$BUILD_DIR_G/$BUILD_SUBDIR_WIN/$EXEC_WIN"