fix: remove none linux binary

Change-Id: I2b6531142e689682cc5d1a81d3d1375b3b0419d5
linuxdeepin · Dec 7, 2017 · 9060c18 · 9060c18
1 parent 11dca45
commit 9060c18
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 9 deletions.
diff --git a/debian/control b/debian/control
@@ -16,8 +16,8 @@ Homepage: http://www.linuxdeepin.com/
 Package: deepin-boot-maker
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, p7zip-full, mtools,
- syslinux [linux-amd64 linux-i386], 
+ syslinux [linux-amd64 linux-i386],
  syslinux-common [linux-amd64 linux-i386]
-Description: Deepin Boot Maker is help for user to create a boot usb stick quick and easy
- Deepin Boot Maker is help for user to create a boot usb stick quick and easy, it
- designed to support only deepin install iso, but it can can work for all ubuntu live install iso too.
+Description: Deepin Boot Maker is help for user to create a boot
+ usb stick quick and easy, it designed to support only deepin
+ install iso, but it can work for all ubuntu live install iso too.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -75,7 +75,7 @@ static bool switchToRoot(QApplication &app)
 
 int main(int argc, char **argv)
 {
-    Q_INIT_RESOURCE(blob);
+    Utils::initResource();
 #if defined(STATIC_LIB)
     DWIDGET_INIT_RESOURCE();
 #endif

diff --git a/src/libdbm/blob_linux.qrc b/src/libdbm/blob_linux.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/">
+        <file>blob/syslinux/syslinux.cfg</file>
+        <file>blob/xfbinst/fb.cfg</file>
+        <file>blob/xfbinst/xfbinst</file>
+    </qresource>
+</RCC>
diff --git a/src/libdbm/libdbm.pro b/src/libdbm/libdbm.pro
@@ -41,6 +41,8 @@ unix {
 #    INSTALLS += target
 }
 
-RESOURCES +=  \
-    blob.qrc \
-
+linux {
+    RESOURCES += blob_linux.qrc
+} else {
+    RESOURCES += blob.qrc
+}
diff --git a/src/libdbm/util/utils.cpp b/src/libdbm/util/utils.cpp
@@ -30,6 +30,15 @@
 #include <Windows.h>
 #endif
 
+
+static void initQRC() {
+#ifdef Q_OS_LINUX
+    Q_INIT_RESOURCE(blob_linux);
+#else
+    Q_INIT_RESOURCE(blob);
+#endif
+}
+
 namespace Utils
 {
 
@@ -303,4 +312,9 @@ QList<DeviceInfo> ListUsbDrives()
     return deviceList;
 }
 
+void initResource()
+{
+    initQRC();
+}
+
 }
diff --git a/src/libdbm/util/utils.h b/src/libdbm/util/utils.h
@@ -28,6 +28,7 @@
 namespace Utils
 {
 
+void initResource();
 void loadTranslate();
 void ClearTargetDev(const QString &targetPath);
 bool CheckInstallDisk(const QString &targetDev);

diff --git a/src/service/main.cpp b/src/service/main.cpp
@@ -26,6 +26,7 @@
 
 #include "LogManager.h"
 
+#include "util/utils.h"
 #include "bootmakerservice.h"
 
 const QString BootMakerServiceName = "com.deepin.bootmaker";
@@ -35,7 +36,7 @@ int main(int argc, char *argv[])
 {
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
 
-    Q_INIT_RESOURCE(blob);
+    Utils::initResource();
 
     QCoreApplication a(argc, argv);
     a.setOrganizationName("deepin");