new code structure, refactored CMake build files, added a COPYING license file, change gettext domain from snap to snap-photobooth

Author: Mario Guerriero

.bzrignore

@@ -1,2 +1,8 @@
-../src/config.vala
+*~
+src/*~
+
+thumbview/*~
+
+build/
+
 src/config.vala

CMakeLists.txt

@@ -1,86 +1,74 @@
-# Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
+# Check http://elementaryos.org/docs/developer-guide/cmake for documentation
 
-cmake_minimum_required (VERSION 2.6)
-cmake_policy (VERSION 2.6)
-project (snap)
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/snap")
-set (GETTEXT_PACKAGE "snap")
-set (RELEASE_NAME ".")
+cmake_minimum_required (VERSION 2.8)
+cmake_policy (VERSION 2.8)
+project (snap-photobooth)
+enable_testing ()
+set (DATADIR "${CMAKE_INSTALL_PREFIX}/share/snap-photobooth")
+set (SCRIPTDIR "${CMAKE_INSTALL_PREFIX}/share/snap-photobooth/scripts")
+set (PKGDATADIR "${DATADIR}/snap-photobooth")
+set (GETTEXT_PACKAGE "snap-photobooth")
+set (RELEASE_NAME "Photobooth App.")
 set (VERSION "0.1")
 set (VERSION_INFO "Release")
-set (CMAKE_C_FLAGS "-ggdb")
+set (LIBNAME "snapcore")
+set (LIBVERSION "0")
+set (SOVERSION 0)
+set (PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/snap-photobooth/plugins/")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
 set (DOLLAR "$")
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-# Configure file  
 
+# Add 'make dist' command for creating release tarball
+set (CPACK_PACKAGE_VERSION ${VERSION})
+set (CPACK_SOURCE_GENERATOR "TGZ")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
+set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}")
+
+include (CPack)
+add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+# Some configuration
 configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CMAKE_SOURCE_DIR}/src/config.vala)
+
+# Some definitions
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
+
+# Vala
+find_package (Vala REQUIRED)
+include (ValaVersion)
+ensure_vala_version ("0.18" MINIMUM)
+include (ValaPrecompile)
+
+add_definitions(-DVALA_VERSION="${VALA_SHORTVER}")
 add_definitions(-DGNOME_DESKTOP_USE_UNSTABLE_API)
-# snap
 
-set (SNAP_DEPS "gee-1.0;gobject-2.0;glib-2.0;gio-2.0;gtk+-3.0;granite;clutter-1.0;clutter-gtk-1.0;gstreamer-1.0;gdk-3.0")
+# Dependencies
+set (SNAP_DEPS gee-1.0 gobject-2.0 glib-2.0 gio-2.0 gtk+-3.0 granite clutter-1.0 clutter-gtk-1.0 gstreamer-1.0 gdk-3.0)
 find_package (PkgConfig)
-pkg_check_modules (GLIB REQUIRED "glib-2.0 >= 2.26.0")
-pkg_check_modules (GOBJECT REQUIRED "gobject-2.0 >= 2.26.0")
-pkg_check_modules (GIO REQUIRED "gio-2.0 >= 2.26.0")
-pkg_check_modules (GTK+ REQUIRED "gtk+-3.0 >= 3.2")
-pkg_check_modules (GNOMEDESKTOP REQUIRED "gnome-desktop-3.0 >= 3.0")
+pkg_check_modules (GTK+ REQUIRED "gtk+-3.0 >= 3.6")
 pkg_check_modules (CHEESE REQUIRED "cheese")
 pkg_check_modules (CHEESEGTK REQUIRED "cheese-gtk")
-pkg_check_modules (CLUTTERGTK REQUIRED "clutter-gtk-1.0")
-pkg_check_modules (LIBGRANITE REQUIRED "granite")
-pkg_check_modules (LIBSQLHEAVY REQUIRED "gstreamer-1.0 >= 1.0")
-pkg_check_modules (DEPS REQUIRED ${SNAP_DEPS} gthread-2.0)
-add_definitions (${DEPS_CFLAGS} ${GNOMEDESKTOP_CFLAGS} ${CLUTTERGTK_CFLAGS} ${CHEESE_CFLAGS} ${CHEESEGTK_CFLAGS} ${LIBSOURCE_CFLAGS} ${GCONF_CFLAGS})
-link_libraries (${DEPS_LIBRARIES} ${GNOMEDESKTOP_LIBRARIES} ${CLUTTERGTK_LIBRARIES} ${CHEESE_LIBRARIES} ${CHEESEGTK_LIBRARIES} ${LIBSOURCE_LIBRARIES} ${GCONF_LIBRARIES})
-link_directories (${DEPS_LIBRARY_DIRS} ${GNOMEDESKTOP_LIBRARY_DIRS} ${CLUTTERGTK_LIBRARY_DIRS} ${CHEESE_LIBRARY_DIRS} ${CHEESEGTK_LIBRARY_DIRS} ${LIBSOURCE_LIBRARY_DIRS} ${GCONF_LIBRARY_DIRS})
-find_package (Vala REQUIRED)
-include (ValaVersion)
-ensure_vala_version ("0.16.0" MINIMUM)
-include (ValaPrecompile)
-vala_precompile(VALA_C
-    src/Resources.vala
-    src/SnapWindow.vala
-    src/Snap.vala
-    src/Recorder.vala
-    src/EffectsManager.vala
-    src/config.vala
-    src/Widgets/EffectPopOver.vala
-    src/Widgets/Countdown.vala
-    src/Widgets/MediaViewer.vala
-    src/Dialogs/Preferences.vala
-    src/Services/Settings.vala
-PACKAGES
-   	${SNAP_DEPS}
-OPTIONS
-    --thread
-    --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
-    --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/libsnap/
-CUSTOM_VAPIS
-    vapi/gnome-desktop-3.0.vapi
-    vapi/cheese-common.vapi
-    libsnap/cheese-thumbview.vapi
-)
-# tranlation stuff
+pkg_check_modules (GNOMEDESKTOP REQUIRED "gnome-desktop-3.0 >= 3.0")
+pkg_check_modules (DEPS REQUIRED ${SNAP_DEPS})
 
-add_subdirectory(po)
-add_subdirectory (libsnap)
-# add_definitions (${CFLAGS} -Wall -Winit-self -Wwrite-strings -Wunreachable-code -Wstrict-prototypes )
+set(NORMAL_CFLAGS ${DEPS_CFLAGS} ${CHEESE_CFLAGS} ${CHEESEGTK_CFLAGS} ${GNOMEDESKTOP_CFLAGS})
+set(NORMAL_LINK_DIRS ${DEPS_LIBRARY_DIRS} ${CHEESE_LIBRARY_DIRS} ${CHEESEGTK_LIBRARY_DIRS} ${GNOMEDESKTOP_LIBRARY_DIRS})
+set(NORMAL_LIBRARIES ${DEPS_LIBRARIES} ${CHEESE_LIBRARIES} ${CHEESEGTK_LIBRARIES} ${GNOMEDESKTOP_LIBRARIES})
 
+add_definitions (${DEPS_CFLAGS} ${CHEESE_CFLAGS} ${CHEESEGTK_CFLAGS} ${GNOMEDESKTOP_CFLAGS})
+link_libraries (${DEPS_LIBRARIES} ${CHEESE_LIBRARIES} ${CHEESEGTK_LIBRARIES} ${GNOMEDESKTOP_LIBRARIES})
+link_directories (${DEPS_LIBRARY_DIRS} ${CHEESE_LIBRARY_DIRS} ${CHEESEGTK_LIBRARY_DIRS} ${GNOMEDESKTOP_LIBRARY_DIRS})
 
-add_executable (snap-photobooth ${VALA_C})
-add_dependencies(snap-photobooth libsnap)
-include_directories(${CMAKE_SOURCE_DIR}/libsnap)
-target_link_libraries (snap-photobooth libsnap)
-#TODO: Installation
 
-install (TARGETS snap-photobooth RUNTIME DESTINATION bin)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/snap-photobooth.svg DESTINATION share/icons/hicolor/scalable/apps)
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/ DESTINATION share/icons/)
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/pixmaps/ DESTINATION share/pixmaps/)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/snap-photobooth.desktop DESTINATION share/applications)
+# Some include paths
+include_directories(${CMAKE_BINARY_DIR}/src)
 
-include(GSettings)
-add_schema("org.pantheon.snap.gschema.xml")
+# Subdirectories
+add_subdirectory (po)
+add_subdirectory (schemas)
+add_subdirectory (thumbview)
+add_subdirectory (src)
+
+# Data
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/snap-photobooth.desktop DESTINATION share/applications)