COMAR CMakeLists.txt dosyasında -Werror parametresi verilmiş. Pisi ile
paketten derlerken bizim flag'ler ezdiği için sorun olmuyor ancak elle
derlendiğinde kaynaktan COMAR derlenmiyordu.
Header'ları düzenledim düzeliyor ancak bu seferde son yaptığın committen
dolayı bir sorun çıkıyordu, onu da düzeltiyorum..
-------- Original Message --------
Subject: branches/comar/corporate2/comar - Reorder headers to avoid
build failures
Date: Wed, 11 May 2011 21:11:16 +0300 (EEST)
From: Ozan Çağlayan <uludag-comm...@pardus.org.tr>
Reply-To: gelistirici@pardus.org.tr
To: uludag-comm...@pardus.org.tr
Author: ozan.caglayan
Date: Wed May 11 21:11:16 2011
New Revision: 36850
Modified:
branches/comar/corporate2/comar/include/policy.h
branches/comar/corporate2/comar/include/pydbus.h
branches/comar/corporate2/comar/src/bus.c
branches/comar/corporate2/comar/src/db.c
branches/comar/corporate2/comar/src/log.c
branches/comar/corporate2/comar/src/loop.c
branches/comar/corporate2/comar/src/main.c
branches/comar/corporate2/comar/src/process.c
branches/comar/corporate2/comar/src/script.c
Log:
Reorder headers to avoid build failures
I can't build comar on Pardus 2011 and openSUSE without this.
BUG:FIXED:12248
---
include/policy.h | 2 +-
include/pydbus.h | 2 +-
src/bus.c | 14 ++++++++------
src/db.c | 14 +++++++-------
src/log.c | 5 +++--
src/loop.c | 18 +++++++++---------
src/main.c | 9 ++++-----
src/process.c | 8 ++++----
src/script.c | 4 ++--
9 files changed, 39 insertions(+), 37 deletions(-)
Modified: branches/comar/corporate2/comar/include/policy.h
=================================================================
--- branches/comar/corporate2/comar/include/policy.h (original)
+++ branches/comar/corporate2/comar/include/policy.h Wed May 11 21:11:16
2011
@@ -28,8 +28,8 @@
#ifndef POLICY_H
#define POLICY_H
-#include <dbus/dbus.h>
#include <Python.h>
+#include <dbus/dbus.h>
#define POLICY_YES 1
#define POLICY_AUTH 0
Modified: branches/comar/corporate2/comar/include/pydbus.h
=================================================================
--- branches/comar/corporate2/comar/include/pydbus.h (original)
+++ branches/comar/corporate2/comar/include/pydbus.h Wed May 11 21:11:16
2011
@@ -30,8 +30,8 @@
#define TYPES_BASIC "sbixd"
#define TYPES_CONTAINER "arD"
-#include <dbus/dbus.h>
#include <Python.h>
+#include <dbus/dbus.h>
char *get_obj_sign(PyObject *obj);
Modified: branches/comar/corporate2/comar/src/bus.c
=================================================================
--- branches/comar/corporate2/comar/src/bus.c (original)
+++ branches/comar/corporate2/comar/src/bus.c Wed May 11 21:11:16 2011
@@ -24,6 +24,13 @@
*
*/
+#include "config.h"
+#include "log.h"
+#include "process.h"
+#include "pydbus.h"
+#include "script.h"
+#include "utils.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -35,12 +42,7 @@
#include <unistd.h>
#include <dirent.h>
-#include "config.h"
-#include "log.h"
-#include "process.h"
-#include "pydbus.h"
-#include "script.h"
-#include "utils.h"
+
//! DBus connection
DBusConnection *bus_conn;
Modified: branches/comar/corporate2/comar/src/db.c
=================================================================
--- branches/comar/corporate2/comar/src/db.c (original)
+++ branches/comar/corporate2/comar/src/db.c Wed May 11 21:11:16 2011
@@ -24,19 +24,19 @@
*
*/
-#include <Python.h>
-#include <dbus/dbus.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-
#include "config.h"
#include "iksemel.h"
#include "script.h"
#include "log.h"
#include "utils.h"
+#include <dirent.h>
+#include <unistd.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+
+#include <dbus/dbus.h>
+
//! Validates model file
int
db_validate_model(iks *xml, char *filename)
Modified: branches/comar/corporate2/comar/src/log.c
=================================================================
--- branches/comar/corporate2/comar/src/log.c (original)
+++ branches/comar/corporate2/comar/src/log.c Wed May 11 21:11:16 2011
@@ -24,12 +24,13 @@
*
*/
+#include "config.h"
+#include "process.h"
+
#include <stdarg.h>
#include <stdio.h>
#include <time.h>
-#include "config.h"
-#include "process.h"
//! Puts time into file
void
Modified: branches/comar/corporate2/comar/src/loop.c
=================================================================
--- branches/comar/corporate2/comar/src/loop.c (original)
+++ branches/comar/corporate2/comar/src/loop.c Wed May 11 21:11:16 2011
@@ -24,6 +24,15 @@
*
*/
+#include "bus.h"
+#include "config.h"
+#include "log.h"
+#include "process.h"
+#include "policy.h"
+#include "pydbus.h"
+#include "script.h"
+#include "utils.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -35,15 +44,6 @@
#include <unistd.h>
#include <dirent.h>
-#include "bus.h"
-#include "config.h"
-#include "log.h"
-#include "process.h"
-#include "policy.h"
-#include "pydbus.h"
-#include "script.h"
-#include "utils.h"
-
#define MAX_FDS 1024
#define MAX_PROC 500
#define MAX_WATCHES 10
Modified: branches/comar/corporate2/comar/src/main.c
=================================================================
--- branches/comar/corporate2/comar/src/main.c (original)
+++ branches/comar/corporate2/comar/src/main.c Wed May 11 21:11:16 2011
@@ -24,11 +24,6 @@
*
*/
-#include <Python.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
#include "config.h"
#include "log.h"
#include "loop.h"
@@ -36,6 +31,10 @@
#include "script.h"
#include "utils.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
int
main(int argc, char *argv[])
{
Modified: branches/comar/corporate2/comar/src/process.c
=================================================================
--- branches/comar/corporate2/comar/src/process.c (original)
+++ branches/comar/corporate2/comar/src/process.c Wed May 11 21:11:16 2011
@@ -24,6 +24,10 @@
*
*/
+#include "process.h"
+#include "log.h"
+#include "utils.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -33,10 +37,6 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "process.h"
-#include "log.h"
-#include "utils.h"
-
struct Proc my_proc;
struct ProcChild *
Modified: branches/comar/corporate2/comar/src/script.c
=================================================================
--- branches/comar/corporate2/comar/src/script.c (original)
+++ branches/comar/corporate2/comar/src/script.c Wed May 11 21:11:16 2011
@@ -24,8 +24,6 @@
*
*/
-#include <string.h>
-
#include "bus.h"
#include "config.h"
#include "db.h"
@@ -35,6 +33,8 @@
#include "process.h"
#include "utils.h"
+#include <string.h>
+
//! Core dictionary
PyObject *py_core;
_______________________________________________
Uludag-commits mailing list
uludag-comm...@pardus.org.tr
http://liste.pardus.org.tr/mailman/listinfo/uludag-commits
_______________________________________________
Gelistirici mailing list
Gelistirici@pardus.org.tr
http://liste.pardus.org.tr/mailman/listinfo/gelistirici
