Commits

Vincent Rabeux  committed f7e4d70

Missing files (refs #1)

  • Participants
  • Parent commits 5917cdd

Comments (0)

Files changed (5)

File documentImageCreator/src/framework/CMakeLists.txt

 
 set(DocumentCreator_MAJOR_VERSION 0)
 set(DocumentCreator_MINOR_VERSION 1)
-set(DocumentCreator_PATCH_VERSION 0)
+set(DocumentCreator_PATCH_VERSION 1)
 
 
 include_directories(.)
 
 
 
+
+if(UNIX AND NOT APPLE)
+    set(CMAKE_INSTALL_PREFIX /usr)
+endif()
+
 ########################################################################################
 # CPACK
 ################

File documentImageCreator/src/gui/AncientDocumentEditor/AncientDocumentEditor.desktop.in

+[Desktop Entry]
+Version=@AncientDocumentEditor_VERSION@
+Name=AncientDocumentEditor
+Comment=@AncientDocumentEditor_DESCRIPTION@
+Exec=@PACKAGE_INSTALL_PREFIX@/bin/AncientDocumentEditor
+Icon=@APPLICATION_ICON_PATH@
+Terminal=false
+Type=Application
+Categories=Utility;Application;

File documentImageCreator/src/gui/AncientDocumentEditor/CMakeLists.txt

 set(AncientDocumentEditor_VENDOR "labri")
 
 set(AncientDocumentEditor_MAJOR_VERSION 0)
-set(AncientDocumentEditorr_MINOR_VERSION 1)
-set(AncientDocumentEditor_PATCH_VERSION 0)
+set(AncientDocumentEditor_MINOR_VERSION 1)
+set(AncientDocumentEditor_PATCH_VERSION 2)
+set(AncientDocumentEditor_VERSION ${AncientDocumentEditor_MAJOR_VERSION}.${AncientDocumentEditor_MINOR_VERSION}.${AncientDocumentEditor_PATCH_VERSION})
+
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
     SET( PROGNAME AncientDocumentEditor )
 ENDIF( APPLE )
 
-  if( UNIX AND NOT APPLE )
-    if( NOT DESKTOP_ENTRY )
-      set( DESKTOP_ENTRY AncientDocumentEditor.desktop )
-    endif( NOT DESKTOP_ENTRY )
-	
-	set(CMAKE_INSTALL_PREFIX /usr/local/)
+if( UNIX AND NOT APPLE )
 
-    add_custom_command( OUTPUT ${DESKTOP_ENTRY}
-      COMMAND touch ${DESKTOP_ENTRY}
-      COMMAND sh ${CMAKE_SOURCE_DIR}/adoc-desktop.sh ${CMAKE_INSTALL_PREFIX} >${DESKTOP_ENTRY}
-      DEPENDS adoc-desktop.sh
-      COMMENT "Generating desktop entry file"
-      )
-    add_custom_target( DESKTOP_ENTRY_FILE ALL
-      DEPENDS ${DESKTOP_ENTRY}
-      )
-  endif( UNIX AND NOT APPLE )
+    SET(PACKAGE_INSTALL_PREFIX /usr/local)
+    set(CMAKE_INSTALL_PREFIX ${PACKAGE_INSTALL_PREFIX})
+
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/images/appicon.png DESTINATION share/AncientDocumentEditor/)
+    set(APPLICATION_ICON_PATH ${CMAKE_INSTALL_PREFIX}/share/AncientDocumentEditor/appicon.png)
+
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AncientDocumentEditor.desktop DESTINATION  /usr/share/applications)
+
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/AncientDocumentEditor.desktop.in
+               ${CMAKE_CURRENT_BINARY_DIR}/AncientDocumentEditor.desktop
+               @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AncientDocumentEditor.desktop DESTINATION  /usr/share/applications/)
+
+
+
+endif( UNIX AND NOT APPLE )
 
 
 
 set(CPACK_PACKAGE_NAME AncientDocumentEditor)
 
 set(CPACK_PACKAGE_VENDOR ${AncientDocumentEditor_VENDOR})
-set(AncientDocumentEditor_VERSION ${AncientDocumentEditor_MAJOR_VERSION}.${AncientDocumentEditor_MINOR_VERSION}.${AncientDocumentEditor_PATCH_VERSION})
 SET(CPACK_PACKAGE_VERSION "${AncientDocumentEditor_VERSION}")
 SET(CPACK_PACKAGE_VERSION_MAJOR "${AncientDocumentEditor_MAJOR_VERSION}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${AncientDocumentEditor_MINOR_VERSION}")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY AncientDocumentEditor)
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${AncientDocumentEditor_DESCRIPTION})
 
+
+
 IF(UNIX AND NOT APPLE)
         SET(CPACK_GENERATOR "DEB")
         SET(CPACK_DEBIAN_PACKAGE_NAME "AncientDocumentEditor")
         SET(CPACK_DEBIAN_PACKAGE_MAINTAINER ${AncientDocumentEditor_AUTHOR})
         SET(CPACK_PACKAGE_CONTACT "digidoc@gmail.com")
-        Set(CPACK_PACKAGING_INSTALL_PREFIX /usr/local)
+        Set(CPACK_PACKAGING_INSTALL_PREFIX ${PACKAGE_INSTALL_PREFIX})
         SET(DEB_DEPENDENCIES "libc6 (>= 2.3.1-6), libgcc1 (>= 1:3.4.2-12), libqt4-core (>=4.8.0), libqt4-gui (>=4.8.0), libopencv-dev, libdocumentcreator-dev, liblipsum4qt-dev")
         IF(NOT DEFINED AncientDocumentEditor_DEB_DEPENDS)
                 SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${DEB_DEPENDENCIES}")

File documentImageCreator/src/gui/AncientDocumentEditor/src/appconstants.h.in

+#ifndef APPCONSTANTS_H
+#define APPCONSTANTS_H
+
+const QString AppConfigFile = "@APPLICATION_INI_PATH@";
+
+
+/* Groups config */
+const QString AppConfigMainGroup = "mainapp" ;
+const QString AppConfigKeyBoardGroup = "keyboard";
+const QString AppConfigFontGroup = "fonteditor" ;
+const QString AppConfigDocGroup = "doceditor";
+
+/* keys */
+const QString AppConfigFontFolderKey = "fontfolder" ;
+const QString AppConfigDefaultFontKey = "defaultfont" ;
+const QString AppConfigFontExtKey = "defaultfontextension" ;
+const QString AppConfigKbFolderKey = "formatsfolder" ;
+const QString AppConfigKbDefautlFormatKey = "defaultformat";
+const QString AppConfigPageSizeX="pagesizex";
+const QString AppConfigPageSizeY="pagesizey";
+const QString AppConfigBackgdFolderKey="backgroundfolder";
+const QString AppConfigDefaultBackbg="defaultbackground";
+const QString AppConfigXmlCheckerFolderKey="xmlcheckerfolder";
+const QString AppConfigDocumentXSDCheckerKey="documentxsdchecker";
+
+/* Some app displays */
+const static QString AppTitle = "Ancient Document Editor - ";
+const static QString DefaultPath = "New old document";
+const static QString ModifiedStr = "*";
+
+#endif // APPCONSTANTS_H

File libs/Lipsum4Qt/CMakeLists.txt

 
 set(Lipsum4Qt_MAJOR_VERSION 0)
 set(Lipsum4Qt_MINOR_VERSION 1)
-set(Lipsum4Qt_PATCH_VERSION 0)
+set(Lipsum4Qt_PATCH_VERSION 1)
 
 
 SET( LIB_NAME Lipsum4Qt )
 TARGET_LINK_LIBRARIES(${LIB_NAME} ${QT_LIBRARIES})
 
 
-
-
-
 INSTALL(FILES ${Lipsum4Qt_headers} DESTINATION include/Lipsum4Qt)
 
 
 
 INSTALL(FILES Lipsum4Qt.pc DESTINATION lib/pkgconfig)
 
+if(UNIX AND NOT APPLE)
+    set(CMAKE_INSTALL_PREFIX /usr)
+endif()
 
 ########################################################################################
 # CPACK