From 09a2c931d7bcd990de02c955ba0c34b3fd446e91 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Wed, 4 May 2022 18:44:06 +0800
Subject: [PATCH] =?UTF-8?q?amd64=E7=9B=AE=E5=BD=95=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BAx86=5F64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HGSolution/HGScanner.pro                  |  4 +-
 uos_amd64_build.sh => build.sh                | 10 ++---
 build/uos/{amd64 => x86_64}/HGBase/HGBase.cbp |  2 +-
 .../{amd64 => x86_64}/HGImgFmt/HGImgFmt.cbp   |  4 +-
 .../{amd64 => x86_64}/HGImgProc/HGImgProc.cbp |  4 +-
 .../HGSaneUser/HGSaneUser.cbp                 |  0
 build/uos/{amd64 => x86_64}/HGTest/HGTest.cbp |  2 +-
 build/uos/{amd64 => x86_64}/HGTest/main.cpp   |  0
 .../HGWebService/HGWebService.cbp             |  4 +-
 build/uos/{amd64 => x86_64}/default.workspace |  0
 uos_aarch64_build.sh                          | 42 -------------------
 uos_mips64_build.sh                           | 42 -------------------
 12 files changed, 15 insertions(+), 99 deletions(-)
 rename build-qt/uos/{amd64 => x86_64}/HGSolution/HGScanner.pro (97%)
 rename uos_amd64_build.sh => build.sh (63%)
 mode change 100755 => 100644
 rename build/uos/{amd64 => x86_64}/HGBase/HGBase.cbp (96%)
 rename build/uos/{amd64 => x86_64}/HGImgFmt/HGImgFmt.cbp (94%)
 rename build/uos/{amd64 => x86_64}/HGImgProc/HGImgProc.cbp (92%)
 rename build/uos/{amd64 => x86_64}/HGSaneUser/HGSaneUser.cbp (100%)
 rename build/uos/{amd64 => x86_64}/HGTest/HGTest.cbp (95%)
 rename build/uos/{amd64 => x86_64}/HGTest/main.cpp (100%)
 rename build/uos/{amd64 => x86_64}/HGWebService/HGWebService.cbp (95%)
 rename build/uos/{amd64 => x86_64}/default.workspace (100%)
 delete mode 100755 uos_aarch64_build.sh
 delete mode 100755 uos_mips64_build.sh

diff --git a/build-qt/uos/amd64/HGSolution/HGScanner.pro b/build-qt/uos/x86_64/HGSolution/HGScanner.pro
similarity index 97%
rename from build-qt/uos/amd64/HGSolution/HGScanner.pro
rename to build-qt/uos/x86_64/HGSolution/HGScanner.pro
index 1960dce9..5dec2be1 100644
--- a/build-qt/uos/amd64/HGSolution/HGScanner.pro
+++ b/build-qt/uos/x86_64/HGSolution/HGScanner.pro
@@ -18,9 +18,9 @@ RC_ICONS = ../../../../app/scanner/image_rsc/logo/logo.ico
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 unix {
-        LIBS += -L../../../../../release/uos/amd64 -lHGBase -lHGImgFmt -lHGImgProc -lpdf -lmupdf -lhgdriver -lsane-hgsane
+        LIBS += -L../../../../../release/uos/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lpdf -lmupdf -lhgdriver -lsane-hgsane
     CONFIG(release, debug|release) {
-        DESTDIR = ../../../../../release/uos/amd64/
+        DESTDIR = ../../../../../release/uos/x86_64/
     }
     CONFIG(debug, debug|release) {
         
diff --git a/uos_amd64_build.sh b/build.sh
old mode 100755
new mode 100644
similarity index 63%
rename from uos_amd64_build.sh
rename to build.sh
index 143d1789..b9eb42d0
--- a/uos_amd64_build.sh
+++ b/build.sh
@@ -1,10 +1,10 @@
 echo "Build QT base components require tool 'cbp2make' ..."
 sudo apt-get install cbp2make
 
-cd ./build/uos/amd64/HGBase
+cd ./build/uos/x86_64/HGBase
 cbp2make -in HGBase.cbp -out makefile
 make
-sudo mv ../../../../../release/uos/amd64/HGBase.so ../../../../../release/uos/amd64/libHGBase.so
+sudo mv ../../../../../release/uos/x86_64/HGBase.so ../../../../../release/uos/x86_64/libHGBase.so
 sudo rm -rf ./bin
 sudo rm -rf ./obj
 sudo rm -f makefile
@@ -12,7 +12,7 @@ sudo rm -f makefile
 cd ../HGImgFmt
 cbp2make -in HGImgFmt.cbp -out makefile
 make
-sudo mv ../../../../../release/uos/amd64/HGImgFmt.so ../../../../../release/uos/amd64/libHGImgFmt.so
+sudo mv ../../../../../release/uos/x86_64/HGImgFmt.so ../../../../../release/uos/x86_64/libHGImgFmt.so
 sudo rm -rf ./bin
 sudo rm -rf ./obj
 sudo rm -f makefile
@@ -20,7 +20,7 @@ sudo rm -f makefile
 cd ../HGImgProc
 cbp2make -in HGImgProc.cbp -out makefile
 make
-sudo mv ../../../../../release/uos/amd64/HGImgProc.so ../../../../../release/uos/amd64/libHGImgProc.so
+sudo mv ../../../../../release/uos/x86_64/HGImgProc.so ../../../../../release/uos/x86_64/libHGImgProc.so
 sudo rm -rf ./bin
 sudo rm -rf ./obj
 sudo rm -f makefile
@@ -32,7 +32,7 @@ sudo rm -rf ./bin
 sudo rm -rf ./obj
 sudo rm -f makefile
 
-cd ../../../../build-qt/uos/amd64/HGSolution
+cd ../../../../build-qt/uos/x86_64/HGSolution
 qmake -makefile HGScanner.pro
 make
 sudo rm -f *.o
diff --git a/build/uos/amd64/HGBase/HGBase.cbp b/build/uos/x86_64/HGBase/HGBase.cbp
similarity index 96%
rename from build/uos/amd64/HGBase/HGBase.cbp
rename to build/uos/x86_64/HGBase/HGBase.cbp
index 7adea905..4f5eae17 100644
--- a/build/uos/amd64/HGBase/HGBase.cbp
+++ b/build/uos/x86_64/HGBase/HGBase.cbp
@@ -18,7 +18,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="../../../../../release/uos/amd64/HGBase" prefix_auto="1" extension_auto="1" />
+				<Option output="../../../../../release/uos/x86_64/HGBase" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
diff --git a/build/uos/amd64/HGImgFmt/HGImgFmt.cbp b/build/uos/x86_64/HGImgFmt/HGImgFmt.cbp
similarity index 94%
rename from build/uos/amd64/HGImgFmt/HGImgFmt.cbp
rename to build/uos/x86_64/HGImgFmt/HGImgFmt.cbp
index 7ff378c7..39087f53 100644
--- a/build/uos/amd64/HGImgFmt/HGImgFmt.cbp
+++ b/build/uos/x86_64/HGImgFmt/HGImgFmt.cbp
@@ -18,7 +18,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="../../../../../release/uos/amd64/HGImgFmt" prefix_auto="1" extension_auto="1" />
+				<Option output="../../../../../release/uos/x86_64/HGImgFmt" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -53,7 +53,7 @@
 			<Add option="-L../../../../third_party/libzip/uos/amd64/lib -lzip" />
 			<Add option="-L../../../../third_party/tinyxml2/uos/amd64/lib -ltinyxml2" />
 			<Add option="-L../../../../third_party/zlib/uos/amd64/lib -lz" />
-			<Add option="-L../../../../../release/uos/amd64 -lHGBase -lmupdf -lpdf" />
+			<Add option="-L../../../../../release/uos/x86_64 -lHGBase -lmupdf -lpdf" />
 			<Add option="-Wl,--exclude-libs,ALL" />
 			<Add option="-z defs" />
 			<Add option="-B direct" />
diff --git a/build/uos/amd64/HGImgProc/HGImgProc.cbp b/build/uos/x86_64/HGImgProc/HGImgProc.cbp
similarity index 92%
rename from build/uos/amd64/HGImgProc/HGImgProc.cbp
rename to build/uos/x86_64/HGImgProc/HGImgProc.cbp
index 02c2e865..884570b2 100644
--- a/build/uos/amd64/HGImgProc/HGImgProc.cbp
+++ b/build/uos/x86_64/HGImgProc/HGImgProc.cbp
@@ -18,7 +18,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="../../../../../release/uos/amd64/HGImgProc" prefix_auto="1" extension_auto="1" />
+				<Option output="../../../../../release/uos/x86_64/HGImgProc" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -46,7 +46,7 @@
 			<Add option="-lopencv_core" />
 			<Add option="-littnotify" />
 			<Add option="-lzlib" />
-			<Add option="-L../../../../../release/uos/amd64 -lHGBase" />
+			<Add option="-L../../../../../release/uos/x86_64 -lHGBase" />
 			<Add option="-ldl" />
 			<Add option="-lpthread" />
 			<Add option="-Wl,--exclude-libs,ALL" />
diff --git a/build/uos/amd64/HGSaneUser/HGSaneUser.cbp b/build/uos/x86_64/HGSaneUser/HGSaneUser.cbp
similarity index 100%
rename from build/uos/amd64/HGSaneUser/HGSaneUser.cbp
rename to build/uos/x86_64/HGSaneUser/HGSaneUser.cbp
diff --git a/build/uos/amd64/HGTest/HGTest.cbp b/build/uos/x86_64/HGTest/HGTest.cbp
similarity index 95%
rename from build/uos/amd64/HGTest/HGTest.cbp
rename to build/uos/x86_64/HGTest/HGTest.cbp
index 2c29ac71..96241f25 100644
--- a/build/uos/amd64/HGTest/HGTest.cbp
+++ b/build/uos/x86_64/HGTest/HGTest.cbp
@@ -32,7 +32,7 @@
 			<Add option="-Wall" />
 		</Compiler>
 		<Linker>
-			<Add option="-L../../../../../release/uos/amd64" />
+			<Add option="-L../../../../../release/uos/x86_64" />
 			<Add option="-lHGBase" />
 			<Add option="-lHGImgFmt" />
 			<Add option="-lmupdf" />
diff --git a/build/uos/amd64/HGTest/main.cpp b/build/uos/x86_64/HGTest/main.cpp
similarity index 100%
rename from build/uos/amd64/HGTest/main.cpp
rename to build/uos/x86_64/HGTest/main.cpp
diff --git a/build/uos/amd64/HGWebService/HGWebService.cbp b/build/uos/x86_64/HGWebService/HGWebService.cbp
similarity index 95%
rename from build/uos/amd64/HGWebService/HGWebService.cbp
rename to build/uos/x86_64/HGWebService/HGWebService.cbp
index 2458f9a7..2bbf7f29 100644
--- a/build/uos/amd64/HGWebService/HGWebService.cbp
+++ b/build/uos/x86_64/HGWebService/HGWebService.cbp
@@ -16,7 +16,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="../../../../../release/uos/amd64/HGWebService" prefix_auto="1" extension_auto="1" />
+				<Option output="../../../../../release/uos/x86_64/HGWebService" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -39,7 +39,7 @@
 			<Add directory="../../../../third_party/json" />
 		</Compiler>
 		<Linker>
-			<Add option="-L../../../../../release/uos/amd64" />
+			<Add option="-L../../../../../release/uos/x86_64" />
 			<Add option="-lHGBase" />
 			<Add option="-lHGImgFmt" />
 			<Add option="-lmupdf" />
diff --git a/build/uos/amd64/default.workspace b/build/uos/x86_64/default.workspace
similarity index 100%
rename from build/uos/amd64/default.workspace
rename to build/uos/x86_64/default.workspace
diff --git a/uos_aarch64_build.sh b/uos_aarch64_build.sh
deleted file mode 100755
index 233b85dc..00000000
--- a/uos_aarch64_build.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-echo "Build QT base components require tool 'cbp2make' ..."
-sudo apt-get install cbp2make
-
-cd ./build/uos/aarch64/HGBase
-cbp2make -in HGBase.cbp -out makefile
-make
-sudo mv ../../../../../release/uos/aarch64/HGBase.so ../../../../../release/uos/aarch64/libHGBase.so
-sudo rm -rf ./bin
-sudo rm -rf ./obj
-sudo rm -f makefile
-
-cd ../HGImgFmt
-cbp2make -in HGImgFmt.cbp -out makefile
-make
-sudo mv ../../../../../release/uos/aarch64/HGImgFmt.so ../../../../../release/uos/aarch64/libHGImgFmt.so
-sudo rm -rf ./bin
-sudo rm -rf ./obj
-sudo rm -f makefile
-
-cd ../HGImgProc
-cbp2make -in HGImgProc.cbp -out makefile
-make
-sudo mv ../../../../../release/uos/aarch64/HGImgProc.so ../../../../../release/uos/aarch64/libHGImgProc.so
-sudo rm -rf ./bin
-sudo rm -rf ./obj
-sudo rm -f makefile
-
-cd ../HGWebService
-cbp2make -in HGWebService.cbp -out makefile
-make
-sudo rm -rf ./bin
-sudo rm -rf ./obj
-sudo rm -f makefile
-
-cd ../../../../build-qt/uos/aarch64/HGSolution
-qmake -makefile HGScanner.pro
-make
-sudo rm -f *.o
-sudo rm -f *.h
-sudo rm -f *.cpp
-sudo rm -f .qmake.stash
-sudo rm -f Makefile
diff --git a/uos_mips64_build.sh b/uos_mips64_build.sh
deleted file mode 100755
index 6ad2d458..00000000
--- a/uos_mips64_build.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-echo "Build QT base components require tool 'cbp2make' ..."
-sudo apt-get install cbp2make
-
-cd ./build/uos/mips64/HGBase
-cbp2make -in HGBase.cbp -out makefile
-make
-sudo mv ../../../../../release/uos/mips64/HGBase.so ../../../../../release/uos/mips64/libHGBase.so
-sudo rm -rf ./bin
-sudo rm -rf ./obj
-sudo rm -f makefile
-
-cd ../HGImgFmt
-cbp2make -in HGImgFmt.cbp -out makefile
-make
-sudo mv ../../../../../release/uos/mips64/HGImgFmt.so ../../../../../release/uos/mips64/libHGImgFmt.so
-sudo rm -rf ./bin
-sudo rm -rf ./obj
-sudo rm -f makefile
-
-cd ../HGImgProc
-cbp2make -in HGImgProc.cbp -out makefile
-make
-sudo mv ../../../../../release/uos/mips64/HGImgProc.so ../../../../../release/uos/mips64/libHGImgProc.so
-sudo rm -rf ./bin
-sudo rm -rf ./obj
-sudo rm -f makefile
-
-cd ../HGWebService
-cbp2make -in HGWebService.cbp -out makefile
-make
-sudo rm -rf ./bin
-sudo rm -rf ./obj
-sudo rm -f makefile
-
-cd ../../../../build-qt/uos/mips64/HGSolution
-qmake -makefile HGScanner.pro
-make
-sudo rm -f *.o
-sudo rm -f *.h
-sudo rm -f *.cpp
-sudo rm -f .qmake.stash
-sudo rm -f Makefile