Browse Source

renamed, cleaned up

gwillz 5 years ago
parent
commit
c18d27f7f8
3 changed files with 42 additions and 27 deletions
  1. 1 1
      .gitlab-ci.yml
  2. 15 0
      installer/install.nsi
  3. 26 26
      FBSlideshow.pro

+ 1 - 1
.gitlab-ci.yml

@@ -2,7 +2,7 @@
 # QT5DIR, QT4DIR, MINGWDIR should be set in config.toml
 # NSIS script should avoid wildcards in dll selection
 variables:
-    project: FBSlideshow
+    project: photobunny
     nsis: install.nsi
 before_script:
     - 'set PATH=%PATH%;%ProgramFiles(x86)%\NSIS;%QT5DIR%\bin;%MINGWDIR%\bin'

+ 15 - 0
installer/install.nsi

@@ -20,6 +20,7 @@ DirText "Select somewhere to install and junk"
 
 #imports
 !include "LogicLib.nsh"
+!include "Sections.nsh"
 
 #layout
 Page license
@@ -80,6 +81,20 @@ Section "Common Files (Required)"
     CreateShortCut "$SMPROGRAMS\Gwillz\PhotoBunny\Uninstall.lnk" "$INSTDIR\uninstall.exe"
 SectionEnd
 
+Section "Source Files"  
+	SectionIn 1
+	
+	SetOutPath "$INSTDIR\src"
+	CreateDirectory "$INSTDIR\src"
+	
+	File "..\*.h"
+	File "..\*.cpp"
+	File "..\*.pro"
+	File "..\*.qrc"
+    File "..\*.rc"
+	File "..\*.png"
+SectionEnd
+
 #uninstall section
 Section "Uninstall"
     #remove program files

+ 26 - 26
FBSlideshow.pro

@@ -1,26 +1,26 @@
-QT      += core gui network webkit
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets
-
-TARGET = photobunny
-TEMPLATE = app
-
-SOURCES += main.cpp\
-           slidewindow.cpp \
-           fbApi.cpp \
-           dialogs.cpp \
-    screenutils.cpp
-
-HEADERS  += slidewindow.h \
-            fbApi.h \
-            dialogs.h \
-    common.h \
-    screenutils.h
-
-RESOURCES += \
-            resources.qrc
-
-win32 {
-    RC_FILE = res.rc
-    HEADERS += version.h
-}
+QT      += core gui network webkit
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets
+
+TARGET = photobunny
+TEMPLATE = app
+
+SOURCES += main.cpp\
+           slidewindow.cpp \
+           fbApi.cpp \
+           dialogs.cpp \
+    screenutils.cpp
+
+HEADERS  += slidewindow.h \
+            fbApi.h \
+            dialogs.h \
+    common.h \
+    screenutils.h
+
+RESOURCES += \
+            resources.qrc
+
+win32 {
+    RC_FILE = res.rc
+    HEADERS += version.h
+}