Merge pull request #61 from ioo0s/master

Fix decompile build error

Author: Anciety

.github/workflows/main.yaml

@@ -95,6 +95,16 @@ jobs:
         with:
           gradle-version: 7.1.1
           arguments: --console plain buildGhidra
+      - name: "MOVE decompile"
+        uses: eskatos/gradle-command-action@v1
+        with:
+          gradle-version: 7.1.1
+          arguments: --console plain buildGhidra
+      - name: "MOVE decompile"
+        uses: eskatos/gradle-command-action@v1
+        with:
+          gradle-version: 7.1.1
+          arguments: --console plain buildGhidra
       - name: "Upload package"
         uses: NyaMisty/upload-artifact@nightly
         with:

Ghidra/Features/Base/src/test/resources/ghidra/app/util/cparser/CParserTest.h

@@ -1,3 +1,18 @@
+/* ###
+ * IP: GHIDRA
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /* ###
  * IP: Copyright
  * EXCLUDE: YES

Ghidra/Features/Decompiler/src/decompile/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 cxx = "1.0"
-clap = "3.0.0-beta.2"
+clap = { git = "https://github.com/clap-rs/clap/"}
 easy-repl = { git = "https://github.com/Escapingbug/easy-repl.git", branch = "different_types" }
 anyhow = "1.0"
 serde = { version = "1.0", features = ["derive"] }

Ghidra/Features/Decompiler/src/decompile/build.rs

@@ -92,7 +92,11 @@ const DECOMPILER_SOURCE_BASE_CXX: &[&str] = &[
     "string_ghidra.cc",
     "xml.cc",
     "ruststream.cc",
-    "testfunction.cc"
+    "testfunction.cc",
+    "interface.cc",
+    "ifacedecomp.cc",
+    "grammar.cc",
+    "callgraph.cc"
 ];
 
 const DECOMPILER_YACC: &[&'static str] = &["xml.y", "grammar.y"];

Ghidra/Features/Decompiler/src/decompile/src/main.rs

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use clap::{Clap, AppSettings};
+use clap::{Parser, ColorChoice};
 use std::env;
 
 pub mod patch;
@@ -22,9 +22,9 @@ pub mod bridge;
 pub mod cli;
 mod serde_int;
 
-#[derive(Clap)]
+#[derive(Parser)]
 #[clap(version = "1.0", author = "BinCraft Team")]
-#[clap(setting = AppSettings::ColoredHelp)]
+#[clap(color = ColorChoice::Auto)]
 struct Opts {
     /// commandline debugging mode
     #[cfg(debug_assertions)]