Merge lp:~xapantu/maya/cmake into lp:~maya-dev-team/maya/maya-revamp

[xapantu]

Add a partial build system.

I have just added a partial build system, for the vala part at least

[lp:~xapantu/maya/cmake]

23. By xapantu on 2011-02-27

merge

24. By xapantu on 2011-02-27

merge

[Jaap Broekhuizen (jaapz-b)]

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-02-27 18:35:13 +0000
@@ -0,0 +1,1 @@
+maya

=== added file '.bzrignore.moved'
--- .bzrignore.moved	1970-01-01 00:00:00 +0000
+++ .bzrignore.moved	2011-02-27 18:35:13 +0000
@@ -0,0 +1,1 @@
+build

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-02-27 18:22:11 +0000
+++ CMakeLists.txt	2011-02-27 18:35:13 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # The name of our project is "HELLO". CMakeLists files in this project can
 # refer to the root source directory of the project as ${HELLO_SOURCE_DIR} and
 # to the root binary directory of the project as ${HELLO_BINARY_DIR}.
@@ -55,3 +56,64 @@
 add_executable(maya ${VALA_C})
 
 install(TARGETS maya RUNTIME DESTINATION bin)
+=======
+# The name of our project is "HELLO". CMakeLists files in this project can
+# refer to the root source directory of the project as ${HELLO_SOURCE_DIR} and
+# to the root binary directory of the project as ${HELLO_BINARY_DIR}.
+cmake_minimum_required (VERSION 2.6)
+project (Maya)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala )
+# Recurse into the "Hello" and "Demo" subdirectories. This does not actually
+# cause another cmake executable to run. The same process will walk through
+# the project's entire directory structure.
+
+#add_subdirectory (src)
+
+find_package(PkgConfig)
+pkg_check_modules(DEPS REQUIRED unique-1.0 gtk+-2.0 gee-1.0 gio-2.0)
+
+add_definitions(${DEPS_CFLAGS})
+
+link_libraries(${DEPS_LIBRARIES})
+
+link_directories(${DEPS_LIBRARY_DIRS})
+
+find_package(Vala REQUIRED)
+include(ValaVersion)
+ensure_vala_version("0.10.0" MINIMUM)
+
+include(ValaPrecompile)
+vala_precompile(VALA_C
+    maya.vala
+    frontend/dialogs/About.vala
+    frontend/dialogs/Event.vala
+    frontend/widgets/Header.vala
+    frontend/widgets/Toolbar.vala
+    frontend/widgets/ModeButton.vala
+    frontend/widgets/CalendarEvent.vala
+    frontend/widgets/HeaderColumn.vala
+    frontend/widgets/DateSwitcher.vala
+    frontend/widgets/Calendar.vala
+    frontend/widgets/Entries.vala
+    frontend/widgets/AppMenu.vala
+    frontend/widgets/Day.vala
+    frontend/widgets/Catalog.vala
+    frontend/widgets/ToolButtonWithMenu.vala
+    frontend/widgets/CalendarView.vala
+    frontend/Utilities.vala
+PACKAGES
+    gtk+-2.0
+    gee-1.0
+    unique-1.0
+    gio-2.0
+OPTIONS
+    --thread
+    )
+
+add_definitions(${CFLAGS} -Wall -Winit-self -Wwrite-strings -Wunreachable-code
+                          -Wstrict-prototypes)
+add_executable(maya ${VALA_C})
+
+install(TARGETS maya RUNTIME DESTINATION bin)
+>>>>>>> MERGE-SOURCE

=== added file 'build_run.OTHER'
--- build_run.OTHER	1970-01-01 00:00:00 +0000
+++ build_run.OTHER	2011-02-27 18:35:13 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+## DBUS stuff
+#install to /usr/bin
+sudo mkdir /usr/share/maya
+sudo cp -r backend /usr/share/maya/
+sudo mv /usr/share/maya/backend/maya_service /usr/bin/maya_service
+
+#make .service file
+sudo rm /usr/share/dbus-1/services/org.elementary.mayaserver.service
+sudo touch /usr/share/dbus-1/services/org.elementary.mayaserver.service
+sudo sh -c "echo '[D-BUS Service]' >> /usr/share/dbus-1/services/org.elementary.mayaserver.service"
+sudo sh -c "echo 'Name=org.elementary.mayaserver' >> /usr/share/dbus-1/services/org.elementary.mayaserver.service"
+sudo sh -c "echo 'Exec=/usr/bin/maya_service' >> /usr/share/dbus-1/services/org.elementary.mayaserver.service"
+sudo sh -c "echo ' ' >> /usr/share/dbus-1/services/org.elementary.mayaserver.service"
+
+#compile maya-frontend