anjuta r3965 - in trunk: . global-tags libanjuta plugins/debug-manager plugins/sourceview plugins/tools/scripts scripts

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Tue May 27 19:59:18 2008
New Revision: 3965
URL: http://svn.gnome.org/viewvc/anjuta?rev=3965&view=rev

Log:
	* scripts/anjuta_import.sh.in,
	plugins/tools/scripts/prepare-changelog.pl,
	global-tags/create_global_tags.sh.in:
	Use sh instead of bash when possible

	* plugins/sourceview/anjuta-document-saver.c,
	plugins/sourceview/anjuta-document-loader.c:
	Order of include matter on OpenBSD

	* plugins/debug-manager/start.c:
	ps syntax differ on *BSD

	* libanjuta/anjuta-launcher.c:
	Fix #527357: gdb plugin doesn't work under OpenBSD (do not clear
	CREAD). Fix #528226: doesn't compiling on FreeBSD6.3


Modified:
   trunk/ChangeLog
   trunk/global-tags/create_global_tags.sh.in
   trunk/libanjuta/anjuta-launcher.c
   trunk/plugins/debug-manager/start.c
   trunk/plugins/sourceview/anjuta-document-loader.c
   trunk/plugins/sourceview/anjuta-document-saver.c
   trunk/plugins/tools/scripts/prepare-changelog.pl
   trunk/scripts/anjuta_import.sh.in

Modified: trunk/global-tags/create_global_tags.sh.in
==============================================================================
--- trunk/global-tags/create_global_tags.sh.in	(original)
+++ trunk/global-tags/create_global_tags.sh.in	Tue May 27 19:59:18 2008
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 function anjuta_tags {
 

Modified: trunk/libanjuta/anjuta-launcher.c
==============================================================================
--- trunk/libanjuta/anjuta-launcher.c	(original)
+++ trunk/libanjuta/anjuta-launcher.c	Tue May 27 19:59:18 2008
@@ -36,13 +36,14 @@
 #include <fcntl.h>
 #include <signal.h>
 
-#if !defined(__sun) && !defined(__NetBSD__)
-#  ifndef FREEBSD
-#    include <pty.h>
-#  else
-#    include <libutil.h>
-#  endif
+#if defined(__FreeBSD__)
+#  include <libutil.h>
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
+#  include <util.h>
+#elif !defined(__sun)
+#  include <pty.h>
 #endif
+
 #include "anjuta-utils-priv.h"
 
 #include <assert.h>
@@ -65,11 +66,15 @@
 #define FILE_BUFFER_SIZE 1024
 #define FILE_INPUT_BUFFER_SIZE		1048576
 #ifndef __MAX_BAUD
-#ifdef __CYGWIN__
-#define __MAX_BAUD B256000
-#else
-#define __MAX_BAUD B460800
-#endif
+#  if defined(B460800)
+#    define __MAX_BAUX B460800
+#  elif defined(B307200)
+#    define __MAX_BAUX B307200
+#  elif defined(B256000)
+#    define __MAX_BAUX B256000
+#  else
+#    define __MAX_BAUX B230400
+#  endif
 #endif
 
 /*
@@ -1209,7 +1214,7 @@
 	termios_flags.c_iflag |= IGNBRK | BRKINT | IMAXBEL | IXANY;
 	termios_flags.c_oflag &= ~OPOST;
 //	termios_flags.c_oflag |= 0;
-	termios_flags.c_cflag &= ~(CSTOPB | CREAD | PARENB | HUPCL);
+	termios_flags.c_cflag &= ~(CSTOPB | PARENB | HUPCL);
 	termios_flags.c_cflag |= CS8 | CLOCAL;
 
 	if (!launcher->priv->terminal_echo_on)

Modified: trunk/plugins/debug-manager/start.c
==============================================================================
--- trunk/plugins/debug-manager/start.c	(original)
+++ trunk/plugins/debug-manager/start.c	Tue May 27 19:59:18 2008
@@ -580,7 +580,11 @@
 		return;
 
 	tmp = anjuta_util_get_a_tmp_file ();
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+	cmd = g_strconcat ("ps axw -o pid,user,lstart,args > ", tmp, NULL);
+#else
 	cmd = g_strconcat ("ps axw -H -o pid,user,start_time,args > ", tmp, NULL);
+#endif
 	shell = gnome_util_user_shell ();
 	ch_pid = fork ();
 	if (ch_pid == 0)

Modified: trunk/plugins/sourceview/anjuta-document-loader.c
==============================================================================
--- trunk/plugins/sourceview/anjuta-document-loader.c	(original)
+++ trunk/plugins/sourceview/anjuta-document-loader.c	Tue May 27 19:59:18 2008
@@ -32,8 +32,8 @@
 #include <config.h>
 #endif
 
-#include <sys/mman.h>
 #include <sys/types.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>

Modified: trunk/plugins/sourceview/anjuta-document-saver.c
==============================================================================
--- trunk/plugins/sourceview/anjuta-document-saver.c	(original)
+++ trunk/plugins/sourceview/anjuta-document-saver.c	Tue May 27 19:59:18 2008
@@ -32,8 +32,8 @@
 #include <config.h>
 #endif
 
-#include <sys/mman.h>
 #include <sys/types.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>

Modified: trunk/plugins/tools/scripts/prepare-changelog.pl
==============================================================================
--- trunk/plugins/tools/scripts/prepare-changelog.pl	(original)
+++ trunk/plugins/tools/scripts/prepare-changelog.pl	Tue May 27 19:59:18 2008
@@ -116,7 +116,7 @@
 	$cached = "--cached";
       }
     print $tmphandle <<EOF;
-#!/bin/bash
+#!/bin/sh
 echo "Index: \$1"
 echo "==================================================================="
 diff -b \$2 \$5 || true

Modified: trunk/scripts/anjuta_import.sh.in
==============================================================================
--- trunk/scripts/anjuta_import.sh.in	(original)
+++ trunk/scripts/anjuta_import.sh.in	Tue May 27 19:59:18 2008
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Shell script to automatically create an Anjuta 1.x project file
 # Copyright: Biswapesh Chattopadhyay (biswapesh_chatterjee tcscal co in) 2001-2002