version bump to 0.89.1-beta

* Fixes copying of shared libraries while bundling on MacOS which was resulting in an assertion violation from Poco.

* Fixes MacOS not changing to the directory of a script launched from finder.

* Fixes the enter key not pressing the default button in audio form lists.

* Linux cross compilation should work again, the Linux build script was pulling down the wrong version of Angelscript.

* `#pragma platform` has been deprecated, you should use the command line to specify platforms instead.

* Adds preprocessor macros to check platform! You can surround code in `#if android ... #endif` for example, or `#if_not windows ... #endif` as well.

Author: samtupy

ASAddon/src/scriptbuilder.cpp

@@ -270,8 +270,9 @@ int CScriptBuilder::ProcessScriptSection(const char *script, unsigned int length
 
 			pos += len;
 
-			if( token == "if" )
+			if( token == "if" || token == "if_not")
 			{
+				bool if_not = token == "if_not";
 				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
 				if( t == asTC_WHITESPACE )
 				{
@@ -289,7 +290,8 @@ int CScriptBuilder::ProcessScriptSection(const char *script, unsigned int length
 					OverwriteCode(start, pos-start);
 
 					// Has this identifier been defined by the application or not?
-					if( definedWords.find(word) == definedWords.end() )
+					bool word_exists = definedWords.find(word) != definedWords.end();
+					if( if_not && word_exists || !if_not && !word_exists )
 					{
 						// Exclude all the code until and including the #endif
 						pos = ExcludeCode(pos);
@@ -848,7 +850,7 @@ int CScriptBuilder::ExcludeCode(int pos)
 			token.assign(&modifiedScript[pos], len);
 			OverwriteCode(pos, len);
 
-			if( token == "if" )
+			if( token == "if" || token == "if_not" )
 			{
 				nested++;
 			}

build/build_linux.sh

@@ -1,9 +1,10 @@
-#!/bin/bash
+F#!/bin/bash
 
 function setup_angelscript {
 	echo Installing Angelscript...
-	git clone --depth 1 https://github.com/codecat/angelscript-mirror||true
+	git clone https://github.com/codecat/angelscript-mirror||true
 	cd "angelscript-mirror/sdk/angelscript/projects/gnuc"
+	git checkout 270b98a332faa57a747c9265086c7bce49c041d9
 	make -j$(nproc)
 	sudo make install
 	cd ../../../../..

doc/src/appendix/Changelog.md

@@ -1,6 +1,14 @@
 # Changelog
 This document lists all major changes that have taken place in NVGT since we started keeping track.
 
+## New in 0.89.1-beta (10/09/2024):
+* Fixes copying of shared libraries while bundling on MacOS which was resulting in an assertion violation from Poco.
+* Fixes MacOS not changing to the directory of scripts launched from finder.
+* Fixes the enter key not pressing the default button in audio form lists.
+* Linux cross compilation should work again, the Linux build script was pulling down the wrong version of Angelscript.
+* `#pragma platform` has been deprecated, you should use the command line / menu options / UI to specify platforms instead.
+* Adds preprocessor macros to check platform! You can surround code in `#if android ... #endif` for example, or `#if_not windows ... #endif` as well. You can even use this to specify custom includes or pragmas just on certain platforms.
+
 ## New in 0.89.0-alpha (10/09/2024):
 * NVGT has now switched to using InnoSetup for it's installer, adding several new options such as adding to path, start menu icons etc.
 * Added the script_function::get_namespace() method as well as script_function::retrieve() which takes a native function handle derived from a funcdef.

doc/src/manual/-Toolkit Configuration.md

@@ -170,17 +170,16 @@ For more information on these properties, the [Angelscript custom options docume
 ## `#pragma` directives
 In a few cases, it is also possible to configure some aspects of NVGT's behavior directly from within nvgt scripts themselves using the `#pragma` preprocessor directive.
 
-This directive is used to safely tell the engine about anything that doesn't directly have to do with your script code but also without causing some sort of compilation error due to bad syntax. A pragma directive could do anything, from embedding a file to choosing a target platform to adding include directories and more.
+This directive is used to safely tell the engine about anything that doesn't directly have to do with your script code but also without causing some sort of compilation error due to bad syntax. A pragma directive could do anything, from embedding a file to selecting assets to choosing  to adding include directories and more.
 
 The syntax for a pragma directive looks like `#pragma name value` or sometimes just `#pragma name` if the option does not require a value. In some cases when a value is to contain a long or complex enough string such as a path, you may need to surround the value in quotes such as `#pragma name "value."`
 
 ### Available directives
 * `#pragma include <directory>`: search for includes in the given directory (directive can be repeated)
-* `#pragma platform <platform>`: select what platform to compile for same as -p argument (auto, android, linux, mac, windows)
 * `#pragma stub <stubname>`: select what stub to compile using (see remarks at the bottom of this article)
 * `#pragma embed <packname>`: embed the given pack into the compiled executable file itself
-* `#pragma asset pathname`: copy the given asset/assets into the bundled product as resources
-* `#pragma document pathname`: copy the given asset/assets into the bundled product as documents intended for the user to access rather than the programmer
+* `#pragma asset <pathname>`: copy the given asset/assets into the bundled product as resources
+* `#pragma document <pathname>`: copy the given asset/assets into the bundled product as documents intended for the user to access rather than the programmer
 * `#pragma plugin <plugname>`: load and activate a plugin given it's dll basename
 * `#pragma compiled_basename <basename>`: the output filename of the compiled executable without the extension
 * `#pragma bytecode_compression <level from 0 to 9>`: controls the compression level for bytecode saved in the compiled executable (0 disabled 9 maximum)

release/include/form.nvgt

@@ -669,7 +669,7 @@ class audio_form {
 			if (subform)
 				return 2;
 		}
-		if ((focused < 0 || c_form[focused].type != ct_keyboard_area) && (focused < 0 || ((!c_form[focused].multiline_enter || !c_form[focused].multiline) && c_form[focused].type == ct_input || c_form[focused].type == ct_button) && key_up(KEY_LCTRL) && key_up(KEY_RCTRL) && key_up(KEY_LSHIFT) && key_up(KEY_RSHIFT)) && (key_pressed(KEY_RETURN) || key_pressed(KEY_NUMPAD_ENTER) || (autotab == 3))) {
+		if ((focused < 0 || c_form[focused].type != ct_keyboard_area) && (focused < 0 || ((!c_form[focused].multiline_enter || !c_form[focused].multiline) && c_form[focused].type == ct_input || c_form[focused].type == ct_button || c_form[focused].type == ct_list) && key_up(KEY_LCTRL) && key_up(KEY_RCTRL) && key_up(KEY_LSHIFT) && key_up(KEY_RSHIFT)) && (key_pressed(KEY_RETURN) || key_pressed(KEY_NUMPAD_ENTER) || (autotab == 3))) {
 			stop_speech();
 			if ((defaults == -1) && (focused > -1)) {
 				if (c_form[focused].type == ct_button || c_form[focused].type == ct_link)

src/angelscript.cpp

@@ -518,13 +518,13 @@ int CompileScript(asIScriptEngine* engine, const string& scriptFile) {
 		Path global_include(Path(android_get_main_shared_object()).parent().parent().parent().append("assets"));
 	#endif
 	g_IncludeDirs.push_back(global_include.toString());
-	if (!g_debug)
-		engine->SetEngineProperty(asEP_BUILD_WITHOUT_LINE_CUES, true);
+	if (!g_debug) engine->SetEngineProperty(asEP_BUILD_WITHOUT_LINE_CUES, true);
+	if (g_platform == "auto") determine_compile_platform(); // Insure that platform defines work whether compiling or executing a script.
 	CScriptBuilder builder;
 	builder.SetIncludeCallback(IncludeCallback, 0);
 	builder.SetPragmaCallback(PragmaCallback, 0);
-	if (builder.StartNewModule(engine, "nvgt_game") < 0)
-		return -1;
+	if (builder.StartNewModule(engine, "nvgt_game") < 0) return -1;
+	if (g_platform != "auto") builder.DefineWord(g_platform.c_str());
 	asIScriptModule* mod = builder.GetModule();
 	if (mod) mod->SetAccessMask(NVGT_SUBSYSTEM_EVERYTHING);
 	try {
@@ -834,9 +834,7 @@ int PragmaCallback(const string& pragmaText, CScriptBuilder& builder, void* /*us
 		string bn = cleanText.substr(18);
 		if (bn == "*") bn.clear();
 		config.setString("build.output_basename", bn);
-	} else if (cleanText.starts_with("platform "))
-		g_platform = cleanText.substr(9);
-	else if (cleanText.starts_with("bytecode_compression ")) {
+	} else if (cleanText.starts_with("bytecode_compression ")) {
 		g_bcCompressionLevel = strtol(cleanText.substr(21).c_str(), NULL, 10);
 		if (g_bcCompressionLevel < 0 || g_bcCompressionLevel > 9) return -1;
 	} else if (cleanText == "console") config.setString("build.windowsConsole", "");

src/bundling.cpp

@@ -219,7 +219,7 @@ class nvgt_compilation_output_impl : public virtual nvgt_compilation_output {
 		for (const game_asset& g : g_game_assets) {
 			Path p = Path(g.bundled_path).makeAbsolute(g.flags & GAME_ASSET_DOCUMENT? document_path : resource_path);
 			if (!File(p.parent()).exists()) File(p.parent()).createDirectories();
-			File(g.filesystem_path).copyTo(p.toString());
+			File(Path(g.filesystem_path).makeAbsolute(Path(get_input_file()).makeParent()).toString()).copyTo(p.toString());
 		}
 	}
 	void copy_shared_libraries(const Path& libpath) {
@@ -232,7 +232,7 @@ class nvgt_compilation_output_impl : public virtual nvgt_compilation_output {
 		StringTokenizer excludes(config.getString("build.shared_library_excludes", "plist TrueAudioNext GPUUtilities systemd_notify sqlite git2 curl"), " "); // Todo: Make this a whitelist once plugins have a way to communicate about extra libraries they load.
 		string source = get_nvgt_lib_directory(g_platform);
 		set<string> libs;
-		Glob::glob("*", source, libs, Glob::GLOB_DOT_SPECIAL | Glob::GLOB_FOLLOW_SYMLINKS | Glob::GLOB_CASELESS);
+		Glob::glob(Path(source).append("*").toString(), libs, Glob::GLOB_DOT_SPECIAL | Glob::GLOB_FOLLOW_SYMLINKS | Glob::GLOB_CASELESS);
 		for (const string& library : libs) {
 			// First check if we wish to exclude this library.
 			bool excluded = false;
@@ -377,7 +377,7 @@ class nvgt_compilation_output_mac : public nvgt_compilation_output_impl {
 		plist_mem_free(plist_xml);
 		plist_free(plist);
 		// Bundle assets and copy shared libraries.
-		bundle_assets(Path(workplace.path()).append("Contents/Resources"), bundle_mode == 3? Path(workplace.path()).makeParent() : Path(workplace.path()).append("Contents/Resources"));
+		bundle_assets(Path(workplace.path()).append("Contents/Resources"), bundle_mode == 2? Path(workplace.path()).makeParent() : Path(workplace.path()).append("Contents/Resources"));
 		copy_shared_libraries(Path(workplace.path()).append("Contents/Frameworks"));
 		if (bundle_mode > 1) {
 			// On the mac, we can execute the hdiutil command to create a .dmg file. Otherwise, we must create a .zip instead, as it can portably store unix file attributes.
@@ -386,7 +386,7 @@ class nvgt_compilation_output_mac : public nvgt_compilation_output_impl {
 				string sout, serr;
 				File dmg_out = Path(final_output_path).makeFile().setExtension("dmg").toString();
 				if (dmg_out.exists()) dmg_out.remove(true);
-				if (!system_command("hdiutil", {"create", "-srcfolder", bundle_mode < 3? workplace.path() : Path(workplace.path()).makeParent().toString(), "-volname", Path(workplace.path()).makeFile().getBaseName(), dmg_out.path()}, sout, serr)) throw Exception(format("Unable to execute hdiutil for .dmg generation: %s", serr));
+				if (!system_command("hdiutil", {"create", "-srcfolder", bundle_mode != 2? workplace.path() : Path(workplace.path()).makeParent().toString(), "-volname", Path(workplace.path()).makeFile().getBaseName(), dmg_out.path()}, sout, serr)) throw Exception(format("Unable to execute hdiutil for .dmg generation: %s", serr));
 				output_path = dmg_out.path();
 			#else
 				File zip_out = Path(final_output_path).makeFile().setExtension("app.zip").toString();

src/nvgt.cpp

@@ -192,7 +192,7 @@ class nvgt_application : public Poco::Util::Application {
 			mode = option == 1? NVGT_RUN : NVGT_COMPILE;
 			try {
 				// Try to change to the directory containing the selected script.
-				ChDir(Poco::Path(script).parent().toString().c_str());
+				ChDir(Poco::Path(script).parent().toString());
 			} catch(...) {} // If it fails, so be it.
 			return script;
 		} else if (option == 4 || option == 5) {
@@ -210,6 +210,7 @@ class nvgt_application : public Poco::Util::Application {
 		string scriptfile = "";
 		#if defined(__APPLE__) || defined(__ANDROID__)
 			scriptfile = event_requested_file(); // Files opened from external apps on MacOS, IOS, and Android do not use command line arguments.
+			if (!scriptfile.empty()) ChDir(Path(scriptfile).makeParent().toString());
 		#endif
 		if (scriptfile.empty() && args.size() > 0) scriptfile = args[0];
 		if (scriptfile.empty() && config().hasOption("application.gui")) scriptfile = UILauncher();

src/xplatform.cpp

@@ -41,6 +41,8 @@ void determine_compile_platform() {
 	g_platform = "linux";
 	#elif defined(__APPLE__)
 	g_platform = "mac"; // Todo: detect difference between IOS and macos (need to look up the correct macros).
+	#elif defined(__ANDROID__)
+	g_platform = "android";
 	#endif
 	// else compilation is not supported on this platform.
 }

version

@@ -1 +1 @@
-0.89.0-alpha
+0.89.1-beta