From dd0170c6c99c92c70288bfbdc1229ef7bb681eb7 Mon Sep 17 00:00:00 2001
From: Rene Hexel <r.hexel@griffith.edu.au>
Date: Sat, 24 Jul 2021 13:28:32 +1000
Subject: [PATCH] Simplify manifest: let gir2swift do sed/awk post-processing

---
 gir-to-swift.sh       | 6 +-----
 gir2swift-manifest.sh | 7 +------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/gir-to-swift.sh b/gir-to-swift.sh
index c2277f8..34bf1c7 100755
--- a/gir-to-swift.sh
+++ b/gir-to-swift.sh
@@ -21,8 +21,4 @@ if [ ! -e "${GIR}" ] ; then
 	echo "and can be found in /usr /usr/local or by pkg-config!"
 	exit 1
 fi
-gir2swift -o Sources/${Mod} -m ${Module}.module -p ${GIR_DIR}/GObject-2.0.gir -p ${GIR_DIR}/GLib-2.0.gir -p ${GIR_DIR}/GObject-2.0.gir -p ${GIR_DIR}/GModule-2.0.gir -p ${GIR_DIR}/Gio-2.0.gir "${GIR}"
-for src in Sources/${Mod}/*-*.swift ; do
-	sed -f ${Module}.sed < ${src} > ${src}.out
-	mv ${src}.out ${src}
-done
+exec gir2swift -o Sources/${Mod} -p ${GIR_DIR}/GObject-2.0.gir -p ${GIR_DIR}/GLib-2.0.gir -p ${GIR_DIR}/GObject-2.0.gir -p ${GIR_DIR}/GModule-2.0.gir -p ${GIR_DIR}/Gio-2.0.gir "${GIR}"
diff --git a/gir2swift-manifest.sh b/gir2swift-manifest.sh
index c14ad18..f16a2c4 100755
--- a/gir2swift-manifest.sh
+++ b/gir2swift-manifest.sh
@@ -15,12 +15,7 @@ function generate_arg-path_arg-g2s-exec_arg-gir-pre_arg-gir-path {
     local NAME=$(package_name)
     local GIR_PRE_ARGS=`for FILE in ${GIR_PRE}; do echo -n "-p ${GIR_PATH}/${FILE}.gir "; done`
     
-    bash -c "${G2S_EXEC} -o Sources/${NAME} -m ${GIR_NAME}.module ${GIR_PRE_ARGS} ${GIR_PATH}/${GIR_NAME}.gir"
-
-    for src in Sources/${NAME}/*-*.swift ; do
-	    sed -f ${GIR_NAME}.sed < ${src} > ${src}.out
-	    mv ${src}.out ${src}
-    done
+    bash -c "${G2S_EXEC} -o Sources/${NAME} ${GIR_PRE_ARGS} ${GIR_PATH}/${GIR_NAME}.gir"
 
     cd $CALLER
 }