1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203
|
Change the command names: gate to gate2, dgate to dgate2,
gtkada-config to gtkada2-config.
--
Ludovic Brenta.
Index: src/gate.in
===================================================================
--- src/gate.in.orig 2006-07-04 07:48:24.000000000 +0200
+++ src/gate.in 2006-07-04 08:05:31.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
if [ $# -eq 0 ]; then
- echo "Usage: gate project-file"
+ echo "Usage: gate2 project-file"
exit 1
fi
@@ -9,7 +9,7 @@
dir=`dirname $1`
file=`cd $dir; pwd`/`basename $1`
-info=`gate-in.exe -p -s -x $file`
+info=`/usr/lib/ada/adalib/gtkada2/bin/gate2-in.exe -p -s -x $file`
stat=$?
if [ $stat != 0 ]; then
@@ -54,13 +54,13 @@
exit 1
fi
-gt=".gate/$prj"
+gt=".gate2/$prj"
mkdir -p $gt > /dev/null 2>&1
tmp=$gt/tmp
/bin/rm -rf $tmp
mkdir $tmp
wd=`pwd`
-gate-in.exe $file > $tmp/gate.ada
+/usr/lib/ada/adalib/gtkada2/bin/gate2-in.exe $file > $tmp/gate.ada
if [ $? != 0 ]; then
echo "Couldn't generate Ada code. Exiting."
@@ -105,7 +105,7 @@
done
if [ $conflicts = 1 ]; then
- cat $gt/conflicts.txt | gdialog error justify_left
+ cat $gt/conflicts.txt | gdialog2 error justify_left
fi
echo done.
Index: src/gate.sh
===================================================================
--- src/gate.sh.orig 2006-07-04 07:48:24.000000000 +0200
+++ src/gate.sh 2006-07-04 08:05:31.000000000 +0200
@@ -1,16 +1,16 @@
#
if [ $# -eq 0 ]; then
- echo "Usage: gate project-file" | gdialog error justify_left
+ echo "Usage: gate2 project-file" | gdialog2 error justify_left
exit 1
fi
dir=`dirname $1|sed -e 's$\\\\$/$g'`
file=`cd $dir; pwd`/`basename $1`
-info=`gate-in.exe -p -s -x $file`
+info=`gate2-in.exe -p -s -x $file`
if [ $? != 0 ]; then
- echo "Couldn't parse $file. Exiting." | gdialog error justify_left
+ echo "Couldn't parse $file. Exiting." | gdialog2 error justify_left
exit 1
fi
@@ -43,12 +43,12 @@
cd $dir/$srcdir
if [ $? != 0 ]; then
- echo "Couldn't change to $dir/$srcdir, aborting." | gdialog error justify_left
+ echo "Couldn't change to $dir/$srcdir, aborting." | gdialog2 error justify_left
exit 1
fi
-gt=".gate/$prj"
-mkdir -p .gate > /dev/null 2>&1
+gt=".gate2/$prj"
+mkdir -p .gate2 > /dev/null 2>&1
mkdir -p $gt > /dev/null 2>&1
tmp=$gt/tmp
rm -rf $tmp
@@ -56,10 +56,10 @@
wd=`pwd`
out=$gt/output.txt
-gate-in.exe $file | grep -v Gtk-WARNING > $tmp/gate.ada
+gate2-in.exe $file | grep -v Gtk-WARNING > $tmp/gate.ada
if [ $? != 0 ]; then
- echo "Couldn't generate Ada code. Exiting." | gdialog error justify_left
+ echo "Couldn't generate Ada code. Exiting." | gdialog2 error justify_left
exit 1
fi
@@ -85,7 +85,7 @@
done
rm -f *.orig
- # cat $out | gdialog information justify_fill
+ # cat $out | gdialog2 information justify_fill
else
echo "The following files have been updated in $psrcdir:" > $out
@@ -98,7 +98,7 @@
echo Files with the ".rej" extension have been generated to help merging>>$out
echo manually if needed.>> $out
- cat $out | gdialog error justify_fill
+ cat $out | gdialog2 error justify_fill
fi
cp -f $tmp/* $gt
Index: src/generate.pl
===================================================================
--- src/generate.pl.orig 2006-07-04 07:48:24.000000000 +0200
+++ src/generate.pl 2006-07-04 08:05:31.000000000 +0200
@@ -1,9 +1,9 @@
-#! /usr/bin/env perl
+#!/usr/bin/perl
use strict;
if ($#ARGV < 0) {
- print "Syntax : generate.pl [switches] file_name [definition-file unit_name]\n";
+ print "Syntax : generate2.pl [switches] file_name [definition-file unit_name]\n";
print " -l : simply list the functions defined in the file (c or Ada)\n";
print " The arguments are then file_name_1 file_name_2]\n";
print " If file_name_2 is present, the output will only show the difference\n";
@@ -13,8 +13,8 @@
print " definition_file : file to parse for the struct definition\n";
print " unit_name : if present, only the functions including this name will be \n";
print " generated\n";
- print " ex/ generate.pl ../include/gdk/gdk.h ../include/gdk/gdktypes.h window\n";
- print " ex/ generate.pl ../include/gtk/gtkframe.h\n";
+ print " ex/ generate2.pl ../include/gdk/gdk.h ../include/gdk/gdktypes.h window\n";
+ print " ex/ generate2.pl ../include/gtk/gtkframe.h\n";
exit;
}
Index: src/glade/glade.ads
===================================================================
--- src/glade/glade.ads.orig 2006-07-04 07:48:24.000000000 +0200
+++ src/glade/glade.ads 2006-07-04 08:05:31.000000000 +0200
@@ -37,7 +37,7 @@
package Glade is
- pragma Linker_Options ("-lgtkada_glade");
+ pragma Linker_Options ("-lgtkada2_glade");
--------------------------------------------
-- dynamic loading of libglade extensions --
Index: src/gtkada-config.in
===================================================================
--- src/gtkada-config.in.orig 2006-07-04 07:48:24.000000000 +0200
+++ src/gtkada-config.in 2006-07-04 08:07:51.000000000 +0200
@@ -4,9 +4,9 @@
prefix=@prefix@
gtk_libs="@GTK_LIBS@"
-gtkada_libs="-L$prefix/lib/gtkada"
-gtkada_cflags="-aI$prefix/include/gtkada -aO$prefix/lib/gtkada"
-gtkada_lflags="-lgtkada"
+gtkada_libs="-L$prefix/lib"
+gtkada_cflags="-aI$prefix/share/ada/adainclude/gtkada2 -aO$prefix/lib/adalib/gtkada2"
+gtkada_lflags="-lgtkada2"
usage()
{
@@ -41,7 +41,7 @@
exit 1
;;
--static)
- gtkada_libs="$prefix/lib/gtkada/libgtkada.a"
+ gtkada_libs="$prefix/lib/libgtkada2.a"
gtkada_lflags=""
;;
--prefix)
Index: src/opengl/gdk-gl.adb
===================================================================
--- src/opengl/gdk-gl.adb.orig 2006-07-04 07:48:24.000000000 +0200
+++ src/opengl/gdk-gl.adb 2006-07-04 08:05:31.000000000 +0200
@@ -31,7 +31,7 @@
package body Gdk.GL is
- pragma Linker_Options ("-lgtkada_gl");
+ pragma Linker_Options ("-lgtkada2_gl");
-----------
-- Query --
|