Changed build scripts for new split project structure

Author: elemc

CMakeLists.txt

@@ -135,7 +135,7 @@ add_executable (${PROJECT} ${HEADERS} ${SOURCES} ${UI_SOURCES} ${MOC_SOURCES} ${
 target_link_libraries (${PROJECT} ${QT_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIB_PROJECT})
 target_link_libraries (${LIB_PROJECT} ${QT_LIBRARIES} ${OPENSSL_LIBRARIES})
 install (TARGETS ${PROJECT} DESTINATION bin)
-install (TARGETS ${LIB_PROJECT} DESTINATION lib)
+install (TARGETS ${LIB_PROJECT} DESTINATION lib${LIB_SUFFIX})
 install (FILES ${DESKTOP_FILE} DESTINATION share/applications)
 install (FILES ${DOCS} DESTINATION share/doc/${PROJECT}-${PROJECT_VERSION})
 
@@ -151,3 +151,9 @@ install (
   FILES images/icons/${PROJECT}.svg
   DESTINATION ${ICON_DEST_PATH}/scalable/apps
   )
+foreach (LIB_HEADER ${LIB_HEADERS})
+  install (
+    FILES ${LIB_HEADER}
+    DESTINATION include/basketpwd
+    )
+endforeach()

ChangeLog.txt

@@ -1,3 +1,7 @@
+Версия 0.4.6
+    * добавлены интерфейсные классы для реализации плагинов
+    * исходники разбиты на составные части (отдельно библиотека, отдельно приложение)
+    * исправлены косметические ошибки
 Версия 0.4.5
     * исправлено несколько ошибок утечки памяти
     * обновлен перевод

basketpwd-gui.pro

@@ -0,0 +1,87 @@
+TEMPLATE = app
+TARGET = basketpwd
+
+QT = gui \
+    core \
+    xml
+#    network # перенос в плагины
+CONFIG += qt \
+#    warn_on \
+#    debug_and_release \
+#    windows \
+    ordered
+
+!mac:DESTDIR = bin
+OBJECTS_DIR = build
+MOC_DIR = build
+UI_DIR = build
+FORMS = ui/mainwindow.ui \
+    ui/changepassword.ui \
+    aboutdialog.ui \
+    ui/settingsdialog.ui
+HEADERS = src/mainwindow.h \
+    src/changepassword.h \
+    aboutdialog.h \
+    src/settingsdialog.h \
+    model/basketmodel.h \
+    src/pluginsloader.h
+SOURCES = src/mainwindow.cpp \
+    src/main.cpp \
+    src/changepassword.cpp \
+    aboutdialog.cpp \
+    src/settingsdialog.cpp \
+    model/basketmodel.cpp \
+    src/pluginsloader.cpp
+RESOURCES += icon-images.qrc
+RC_FILE = basketpwd.rc
+mac:RC_FILE = images/basketpwd.icns
+INCLUDEPATH += libs
+
+QMAKE_INFO_PLIST = tools/Info.plist
+
+ICON_SIZES = 128 192 256 32 36 48 64 72 96
+ICON_PATH = 
+ICON_EXTRA = 
+INSTALL_ROOT=/usr/local
+
+defineTest(CopyIcons) {
+    extra = 
+    path = 
+    for(icon_size, ICON_SIZES) {
+       ICON_EXTRA += install -D -m 0644 -p $${_PRO_FILE_PWD_}/images/icons/basketpwd_$${icon_size}x$${icon_size}.png $(INSTALL_ROOT)/share/icons/hicolor/$${icon_size}x$${icon_size}/apps/basketpwd.png;
+       ICON_PATH += /share/icons/hicolor/$${icon_size}x$${icon_size}/apps
+    }
+    export ( ICON_EXTRA )
+    export ( ICON_PATH )
+}
+
+win32 {
+    CONFIG += static
+    INCLUDEPATH += d:/devel/utils/openssl/openssl-shared-64/include
+    LIBS += -ld:/devel/utils/openssl/openssl-shared-64/lib/libeay32
+}
+unix {
+    LIBS += -lcrypto -lssl -lbasketpwd -L./bin
+    target.path += /bin
+    basket_desktop.files += tools/basketpwd.desktop
+    basket_desktop.path += /share/applications
+    CopyIcons()
+    basket_icon.extra = $${ICON_EXTRA}
+    basket_icon.path  = $${ICON_PATH}
+    basket_svg.files += images/icons/basketpwd.svg
+    basket_svg.path += /share/icons/hicolor/scalable/apps
+
+    INSTALLS += target \
+        basket_desktop \
+        basket_icon \
+        basket_svg
+}
+mac {
+    TARGET = "Basket of passwords"
+}
+VERSION = 0.4.6
+VERSTR = '\\"$${VERSION}\\"'
+DEFINES += VER=\"$${VERSTR}\"
+DEFINES += QMAKE_SET=1
+OTHER_FILES += ChangeLog.txt
+TRANSLATIONS += basketpwd_en.ts

basketpwd.pro

@@ -1,101 +1,6 @@
-TEMPLATE = app
-QT = gui \
-    core \
-    xml
-#    network # перенос в плагины
-CONFIG += qt \
-    warn_on \
-    debug_and_release \
-    windows
-!mac:DESTDIR = bin
-OBJECTS_DIR = build
-MOC_DIR = build
-UI_DIR = build
-FORMS = ui/mainwindow.ui \
-    ui/changepassword.ui \
-    aboutdialog.ui \
-    ui/settingsdialog.ui
-HEADERS = src/mainwindow.h \
-#    src/basketutils.h \
-    src/changepassword.h \
-    aboutdialog.h \
-    src/settingsdialog.h \
-#    model/basketbaseitem.h \
-    model/basketmodel.h \
-#    src/coreplugin.h \
-    src/pluginsloader.h
-#    src/plugin_share.h
-#    netsync/firstnetworksender.h \
-#    netsync/qsyncclientlist.h \
-#    netsync/syncclient.h \
-#    netsync/udplistener.h \
-#    netsync/udpnetworksocket.h
-SOURCES = src/mainwindow.cpp \
-    src/main.cpp \
-#   src/basketutils.cpp \
-    src/changepassword.cpp \
-    aboutdialog.cpp \
-    src/settingsdialog.cpp \
-#    model/basketbaseitem.cpp \
-    model/basketmodel.cpp \
-#    src/coreplugin.cpp \
-    src/pluginsloader.cpp
- #   netsync/firstnetworksender.cpp \
- #   netsync/qsyncclientlist.cpp \
- #   netsync/syncclient.cpp \
- #   netsync/udplistener.cpp \
- #   netsync/udpnetworksocket.cpp
-RESOURCES += icon-images.qrc
-RC_FILE = basketpwd.rc
-mac:RC_FILE = images/basketpwd.icns
-INCLUDEPATH += libs
+TEMPLATE = subdirs
+SUBDIRS = mainapp library
+mainapp.file = basketpwd-gui.pro
+mainapp.depends = library
+library.subdir = libs/basketpwd
 
-QMAKE_INFO_PLIST = tools/Info.plist
-
-ICON_SIZES = 128 192 256 32 36 48 64 72 96
-ICON_PATH = 
-ICON_EXTRA = 
-INSTALL_ROOT=/usr/local
-
-defineTest(CopyIcons) {
-    extra = 
-    path = 
-    for(icon_size, ICON_SIZES) {
-       ICON_EXTRA += install -D -m 0644 -p $${_PRO_FILE_PWD_}/images/icons/basketpwd_$${icon_size}x$${icon_size}.png $(INSTALL_ROOT)/usr/share/icons/hicolor/$${icon_size}x$${icon_size}/apps/basketpwd.png;
-       ICON_PATH += /usr/share/icons/hicolor/$${icon_size}x$${icon_size}/apps
-    }
-    export ( ICON_EXTRA )
-    export ( ICON_PATH )
-}
-
-win32 {
-    CONFIG += static
-    INCLUDEPATH += d:/devel/utils/openssl/openssl-shared-64/include
-    LIBS += -ld:/devel/utils/openssl/openssl-shared-64/lib/libeay32
-}
-unix {
-    LIBS += -lcrypto -lssl -lbasketpwd -L/Users/alex/workspace/code/basketpwd/build
-    TARGET = basketpwd
-    target.path += /usr/bin
-    basket_desktop.files += tools/basketpwd.desktop
-    basket_desktop.path += /usr/share/applications
-    CopyIcons()
-    basket_icon.extra = $${ICON_EXTRA}
-    basket_icon.path  = $${ICON_PATH}
-    basket_svg.files += images/icons/basketpwd.svg
-    basket_svg.path += /usr/share/icons/hicolor/scalable/apps
-
-    INSTALLS += target \
-        basket_desktop \
-        basket_icon \
-        basket_svg
-}
-mac {
-    TARGET = "Basket of passwords"
-}
-VERSION = 0.4.5
-VERSTR = '\\"$${VERSION}\\"'
-DEFINES += VER=\"$${VERSTR}\"
-DEFINES += QMAKE_SET=1
-OTHER_FILES += ChangeLog.txt
-TRANSLATIONS += basketpwd_en.ts

libs/basketpwd/basketpwd-libs.pro libs/basketpwd/basketpwd.pro

@@ -11,6 +11,8 @@ TEMPLATE = lib
 
 DEFINES += BASKETPWD_LIBRARY
 
+DESTDIR = ../../bin/
+
 SOURCES += basketpwdlibs.cpp \
     coreplugin.cpp \
     basketutils.cpp \
@@ -25,28 +27,21 @@ HEADERS += basketpwdlibs.h\
 
 unix {
     LIBS += -lcrypto -lssl
+    eval($$QMAKE_HOST.arch = x86) {
+       target.path = /lib
+    }
+    eval($$QMAKE_HOST.arch = x86_64) {
+       target.path = /lib64
+    }
+
+    # Headers for include
+    include_headers.files += $${HEADERS}
+    include_headers.path = /include/basketpwd
+
+    INSTALLS += target include_headers
 }
 win32 {
     CONFIG += static
     INCLUDEPATH += d:/devel/utils/openssl/openssl-shared-64/include
     LIBS += -ld:/devel/utils/openssl/openssl-shared-64/lib/libeay32
 }
-
-symbian {
-    MMP_RULES += EXPORTUNFROZEN
-    TARGET.UID3 = 0xE426FAEC
-    TARGET.CAPABILITY = 
-    TARGET.EPOCALLOWDLLDATA = 1
-    addFiles.sources = basketpwd.dll
-    addFiles.path = !:/sys/bin
-    DEPLOYMENT += addFiles
-}
-
-unix:!symbian {
-    maemo5 {
-        target.path = /opt/usr/lib
-    } else {
-        target.path = /usr/lib
-    }
-    INSTALLS += target
-}

tools/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleName</key>
 	<string>Basket of passwords</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.5</string>
+	<string>0.4.6</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

tools/SlackBuild/README

@@ -13,31 +13,71 @@ or alternatively you can use GIT to get latest development version:
 Dependencies
 ============
 * Qt libraries version 4.2.1 or later
-* libgcrypt version 1.4.0 or later
+* libgcrypt version 1.4.0 or later (WARNING!!! It is required only for basketpwd version < 0.4.2)
+* openssl version 0.9.7a or later (This required for basketpwd version >= 0.4.2)
+* cmake (optional)
 
 Installation
 ============
 
-On GNU/Linux or FreeBSD
+On GNU/Linux or FreeBSD (without cmake)
 $ qmake (or qmake-qt4 in many linux distributives as Fedora Linux for example)
 $ make release
 # make install INSTALL_ROOT=/usr (for installing in /usr prefix)
  or
 $ sudo make install INSTALL_ROOT=/usr (if sudo configured)
 
-Installation for Fedora Linux 13 (Goddard)
-==========================================
-* add repository rpmatis:
- # rpm -ivh http://repo.atisserv.ru/rpmatis/fedora/13/x86_64/rpmatis-release-13-3.noarch.rpm
-* run yum update:
- # yum update
-* install package basketpwd:
- # yum install basketpwd
+With cmake
+Run bellow commands in source folder
+$ mkdir build; cd build
+$ cmake .. -DCMAKE_INSTALL_PREFIX=/usr #(if you have install application in /usr or simple 'cmake ..' if you have install into /usr/local)
+
+On Mac OS X
+$ mkdir build; cd buld
+$ cmake .. 
+$ make
+$ make mac-bundle # for create only bundle
+or
+$ make mac-dmg    # for create bundle and dmg file
+
+Installation for Fedora Linux
+=============================
+for Fedora 13 and later basketpwd packages in RFRemix repository:
+    # http://koji.russianfedora.ru/koji/packageinfo?packageID=101
+
+Installation for Slackware Linux
+================================
+$ git clone git://github.com/elemc/basketpwd.git		# clone repository from git
+$ cd basketpwd							# enter to application directory
+$ tools/make-source-archive					# make a tarboll for building
+$ cp ../basketpwd*.tar.bz2 tools/SlackBuild/			# copy tarboll to SlackBuild directory
+$ cd tools/SlackBuild
+if version of tarboll not equal version in basketpwd.SlackBuild, then edit to equal.
+$ su -								# enter in root account
+# ./basketpwd.SlackBuild					# build a package
+SlackBuild script tell where him create a package file, type
+# installpkg /path/to/package/basketpwd*.tgz
+
+Installation for OpenSUSE Linux
+===============================
+First, add repository:
+    * for 11.2		http://download.opensuse.org/repositories/home:/elemc/openSUSE_11.2
+    * for 11.3		http://download.opensuse.org/repositories/home:/elemc/openSUSE_11.3
+    * for 11.4		http://download.opensuse.org/repositories/home:/elemc/openSUSE_11.4
+    * for Facctory	http://download.opensuse.org/repositories/home:/elemc/openSUSE_Factory
+ and install package named basketpwd, as example
+    zypper in basketpwd
+ 
+Installation for Windows
+========================
+Go to section Files on github.com/elemc/basketpwd and select one:
+* basketpwd-static-X.X.X.zip - is a statically linked one exe-file for mobility
+* basketpwd-setup-X.X.X.exe  - is a windows installer
 
 Reporting bugs
 ==============
 
-Please send bug reports to the <elemc@atisserv.ru>
+Please send bug reports to the <elemc AT atisserv DOT ru>
 or post to issue in http://github.com/elemc/basketpwd/issues
 
-This all
+Thanks

tools/SlackBuild/basketpwd.SlackBuild

@@ -3,7 +3,7 @@
 # Written by Alexei Panov <[email protected]>
 
 PRGNAM=basketpwd
-VERSION=0.4.4
+VERSION=0.4.6
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_elemc}
@@ -51,7 +51,7 @@ chmod -R a-s,u+w,go+r-w .
 
 mkdir build
 cd build 
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DLIB_SUFFIX=$LIBDIRSUFFIX
 make
 make install DESTDIR=$PKG
 cd ..