diff --git a/GPL/nativeBuildProperties.gradle b/GPL/nativeBuildProperties.gradle index 132c9e2f75..f00b28b2c4 100644 --- a/GPL/nativeBuildProperties.gradle +++ b/GPL/nativeBuildProperties.gradle @@ -18,7 +18,7 @@ apply plugin: 'c' // Unclear if we can rely on the VisualCpp plugin to identify the correct Visual Studio paths project.ext.VISUAL_STUDIO_BASE_DIR = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017" -project.ext.WINDOWS_KITS_DIR = "C:/Program Files (x86)/Windows Kits/10" +project.ext.WINDOWS_KITS_DIR = "C:\\Program Files (x86)\\Windows Kits\\10" /**************************************************************************** * Method for extracting value from = pairs @@ -44,11 +44,6 @@ project.ext.VISUAL_STUDIO_VCVARS_CMD = "UNKNOWN" project.ext.MSVC_SDK_VERSION = "UNKNOWN" project.ext.MSVC_TOOLS_VERSION = "UNKNOWN" -// Ok, this is stupid, but mac and linux can't handle files paths that start with c: -// These paths are actually only used when running on windows, but the paths gets evaulated -// as a file no matter what platform you run gradle on. So the best solution I can think of is as -// follows. -/* if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { project.ext.VISUAL_STUDIO_INSTALL_DIR = project.ext.VISUAL_STUDIO_BASE_DIR + "\\Professional" @@ -108,13 +103,16 @@ model { * Task: verify presence of correct tool chain version for current platform ******************************************************************************************/ task CheckToolChain { + // Native C/Cpp plugins will trigger failure if no tool chain found doFirst { if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { // ensure that required MS Visual Studio is installed where expected - String msg = "Microsoft Visual Studio install not found: ${project.ext.VISUAL_STUDIO_BASE_DIR}\n" + + String msg = "Microsoft Visual Studio install not found: ${VISUAL_STUDIO_BASE_DIR}\n" + "Adjust path in Ghidra/GPL/nativeBuildProperties.gradle if needed." - assert file(project.ext.VISUAL_STUDIO_BASE_DIR).exists() : msg - assert file(project.ext.VISUAL_STUDIO_INSTALL_DIR).exists() : msg + if (!file(VISUAL_STUDIO_BASE_DIR).exists() || + !file(VISUAL_STUDIO_INSTALL_DIR).exists()) { + throw new GradleException(msg); + } } } } diff --git a/Ghidra/Configurations/Public_Release/certification.manifest b/Ghidra/Configurations/Public_Release/certification.manifest index 023e5cea71..95d597b555 100644 --- a/Ghidra/Configurations/Public_Release/certification.manifest +++ b/Ghidra/Configurations/Public_Release/certification.manifest @@ -7,26 +7,6 @@ data/PDB_SYMBOL_SERVER_URLS.pdburl||GHIDRA||||END| src/global/docs/ChangeHistory.html||GHIDRA||||END| src/global/docs/UserAgreement.html||GHIDRA||||END| src/global/docs/WhatsNew.html||GHIDRA||||END| -src/global/docs/languages/html/Diagram1.png||GHIDRA||||END| -src/global/docs/languages/html/Diagram2.png||GHIDRA||||END| -src/global/docs/languages/html/Diagram3.png||GHIDRA||||END| -src/global/docs/languages/html/additionalpcode.html||GHIDRA||||END| -src/global/docs/languages/html/pcodedescription.html||GHIDRA||||END| -src/global/docs/languages/html/pcoderef.html||GHIDRA||||END| -src/global/docs/languages/html/pseudo-ops.html||GHIDRA||||END| -src/global/docs/languages/html/reference.html||GHIDRA||||END| -src/global/docs/languages/html/sleigh.html||GHIDRA||||END| -src/global/docs/languages/html/sleigh_constructors.html||GHIDRA||||END| -src/global/docs/languages/html/sleigh_context.html||GHIDRA||||END| -src/global/docs/languages/html/sleigh_definitions.html||GHIDRA||||END| -src/global/docs/languages/html/sleigh_layout.html||GHIDRA||||END| -src/global/docs/languages/html/sleigh_preprocessing.html||GHIDRA||||END| -src/global/docs/languages/html/sleigh_ref.html||GHIDRA||||END| -src/global/docs/languages/html/sleigh_symbols.html||GHIDRA||||END| -src/global/docs/languages/html/sleigh_tokens.html||GHIDRA||||END| -src/global/docs/languages/index.html||GHIDRA||||END| -src/global/docs/languages/manual_index.txt||GHIDRA||||END| -src/global/docs/languages/versioning.html||GHIDRA||||END| src/main/resources/UserAgreement.html||GHIDRA||||END| src/main/resources/defaultTools/CodeBrowser.tool||GHIDRA||||END| src/main/resources/splash.txt||GHIDRA||||END| diff --git a/GhidraDocs/certification.manifest b/GhidraDocs/certification.manifest index dec57794e2..00156079d4 100644 --- a/GhidraDocs/certification.manifest +++ b/GhidraDocs/certification.manifest @@ -105,3 +105,23 @@ images/table_go.png||FAMFAMFAM Icons - CC 2.5||||END| images/undo.png||GHIDRA||||END| images/up.png||GHIDRA||||END| images/viewmagfit.png||Nuvola Icons - LGPL 2.1||||END| +languages/html/Diagram1.png||GHIDRA||||END| +languages/html/Diagram2.png||GHIDRA||||END| +languages/html/Diagram3.png||GHIDRA||||END| +languages/html/additionalpcode.html||GHIDRA||||END| +languages/html/pcodedescription.html||GHIDRA||||END| +languages/html/pcoderef.html||GHIDRA||||END| +languages/html/pseudo-ops.html||GHIDRA||||END| +languages/html/reference.html||GHIDRA||||END| +languages/html/sleigh.html||GHIDRA||||END| +languages/html/sleigh_constructors.html||GHIDRA||||END| +languages/html/sleigh_context.html||GHIDRA||||END| +languages/html/sleigh_definitions.html||GHIDRA||||END| +languages/html/sleigh_layout.html||GHIDRA||||END| +languages/html/sleigh_preprocessing.html||GHIDRA||||END| +languages/html/sleigh_ref.html||GHIDRA||||END| +languages/html/sleigh_symbols.html||GHIDRA||||END| +languages/html/sleigh_tokens.html||GHIDRA||||END| +languages/index.html||GHIDRA||||END| +languages/manual_index.txt||GHIDRA||||END| +languages/versioning.html||GHIDRA||||END| diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/Diagram1.png b/GhidraDocs/languages/html/Diagram1.png similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/Diagram1.png rename to GhidraDocs/languages/html/Diagram1.png diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/Diagram2.png b/GhidraDocs/languages/html/Diagram2.png similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/Diagram2.png rename to GhidraDocs/languages/html/Diagram2.png diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/Diagram3.png b/GhidraDocs/languages/html/Diagram3.png similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/Diagram3.png rename to GhidraDocs/languages/html/Diagram3.png diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/Frontpage.css b/GhidraDocs/languages/html/Frontpage.css similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/Frontpage.css rename to GhidraDocs/languages/html/Frontpage.css diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/additionalpcode.html b/GhidraDocs/languages/html/additionalpcode.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/additionalpcode.html rename to GhidraDocs/languages/html/additionalpcode.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/languages.css b/GhidraDocs/languages/html/languages.css similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/languages.css rename to GhidraDocs/languages/html/languages.css diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/pcodedescription.html b/GhidraDocs/languages/html/pcodedescription.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/pcodedescription.html rename to GhidraDocs/languages/html/pcodedescription.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/pcoderef.html b/GhidraDocs/languages/html/pcoderef.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/pcoderef.html rename to GhidraDocs/languages/html/pcoderef.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/pseudo-ops.html b/GhidraDocs/languages/html/pseudo-ops.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/pseudo-ops.html rename to GhidraDocs/languages/html/pseudo-ops.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/reference.html b/GhidraDocs/languages/html/reference.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/reference.html rename to GhidraDocs/languages/html/reference.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh.html b/GhidraDocs/languages/html/sleigh.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh.html rename to GhidraDocs/languages/html/sleigh.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_constructors.html b/GhidraDocs/languages/html/sleigh_constructors.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_constructors.html rename to GhidraDocs/languages/html/sleigh_constructors.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_context.html b/GhidraDocs/languages/html/sleigh_context.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_context.html rename to GhidraDocs/languages/html/sleigh_context.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_definitions.html b/GhidraDocs/languages/html/sleigh_definitions.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_definitions.html rename to GhidraDocs/languages/html/sleigh_definitions.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_layout.html b/GhidraDocs/languages/html/sleigh_layout.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_layout.html rename to GhidraDocs/languages/html/sleigh_layout.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_preprocessing.html b/GhidraDocs/languages/html/sleigh_preprocessing.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_preprocessing.html rename to GhidraDocs/languages/html/sleigh_preprocessing.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_ref.html b/GhidraDocs/languages/html/sleigh_ref.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_ref.html rename to GhidraDocs/languages/html/sleigh_ref.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_symbols.html b/GhidraDocs/languages/html/sleigh_symbols.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_symbols.html rename to GhidraDocs/languages/html/sleigh_symbols.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_tokens.html b/GhidraDocs/languages/html/sleigh_tokens.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/html/sleigh_tokens.html rename to GhidraDocs/languages/html/sleigh_tokens.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/index.html b/GhidraDocs/languages/index.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/index.html rename to GhidraDocs/languages/index.html diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/manual_index.txt b/GhidraDocs/languages/manual_index.txt similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/manual_index.txt rename to GhidraDocs/languages/manual_index.txt diff --git a/Ghidra/Configurations/Public_Release/src/global/docs/languages/versioning.html b/GhidraDocs/languages/versioning.html similarity index 100% rename from Ghidra/Configurations/Public_Release/src/global/docs/languages/versioning.html rename to GhidraDocs/languages/versioning.html