[Antiright-devel] antiright Makefile configure gtkshell/Makefile ...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 08/10/24 06:06:18

Modified files:
        .              : Makefile configure 
        gtkshell       : Makefile add_options.c clock.c 

Log message:
        Port to WIN32.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/Makefile?cvsroot=antiright&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/clock.c?cvsroot=antiright&r1=1.10&r2=1.11

Patches:
Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Makefile    16 Jan 2008 18:30:04 -0000      1.22
+++ Makefile    24 Oct 2008 06:06:18 -0000      1.23
@@ -31,8 +31,9 @@
        cd libantiright && $(MAKE)
        cd gtkshell && $(MAKE)
        cd ACE-desktop && $(MAKE)
-       cd xshell && $(MAKE)
-       cd rootcat && $(MAKE)
+       $(XSHELL_BUILD) clean
+       #cd xshell && $(MAKE)
+#      cd rootcat && $(MAKE)
 ctags:
        ctags -w */*.[ch] ACE-desktop/ACE
 
@@ -40,8 +41,9 @@
        cd libantiright && $(MAKE) clean
        cd gtkshell && $(MAKE) clean
        cd ACE-desktop && $(MAKE) clean
-       cd xshell && $(MAKE) clean
-       cd rootcat && $(MAKE) clean
+       $(XSHELL_BUILD) clean
+       #cd xshell && $(MAKE) clean
+#      cd rootcat && $(MAKE) clean
 
 distclean: clean
        rm -rf config.mk tags */.\#* .\#* 
@@ -73,8 +75,9 @@
        $(INSTALL_DATA) doc/INSTALL $(docdir)/antiright
        cd gtkshell && $(MAKE) install
        cd ACE-desktop && $(MAKE) install
-       cd xshell && $(MAKE) install
-       cd rootcat && $(MAKE) install
+       $(XSHELL_BUILD) install
+#      cd xshell && $(MAKE) install
+#      cd rootcat && $(MAKE) install
 
 bzball: distclean
        cd .. && cp -R antiright antiright-$(VERSION) \

Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- configure   24 Oct 2008 05:50:35 -0000      1.115
+++ configure   24 Oct 2008 06:06:18 -0000      1.116
@@ -134,10 +134,17 @@
 
 AS=as
 
-if [ -d /cygdrive ]; then
+XSHELL_BUILD='cd xshell && $(MAKE)'
+if [ "$(uname | cut -d_ -f1)" = "MINGW32" ]; then
        echo WIN32
        WINDOWS="TRUE"
        DEFS="$DEFS -DWIN32"
+<<<<<<< configure
+       CFLAGS="$CFLAGS -mms-bitfields -mno-cygwin"
+       # CC=mingw32-gcc
+       # AS=mingw32-as
+       XSHELL_BUILD='echo xshell unsupported, not built'
+=======
        CFLAGS="$CFLAGS -mms-bitfields -mno-cygwin"
        # CC=mingw32-gcc
        # AS=mingw32-as
@@ -146,8 +153,19 @@
 LEX="$(which flex)"
 if [ "$LEX" = "" ]; then
        LEX=lex
+>>>>>>> 1.115
 fi
 
+LEX="$(which flex)"
+if [ "$LEX" = "" ]; then
+       LEX=lex
+fi
+YACC="$(which bison)"
+if [ "$YACC" = "" ]; then
+       YACC=yacc
+fi
+
+
 INCLUDE="$INCLUDE -I/usr/pkg/include -I/usr/local/include -I/usr/X11R6/include"
 LIBDIR="$LIBDIR -L/usr/pkg/lib -L/usr/local/lib -L/usr/X11R6/lib"
 ARDATADIR=$PREFIX/share/antiright
@@ -166,8 +184,20 @@
 echo "CFLAGS=$CFLAGS" >> config.mk
 echo "CC=$CC" >> config.mk
 echo "LDFLAGS=$LDFLAGS" >> config.mk
+<<<<<<< configure
 echo "LEX=$LEX" >> config.mk
+echo "YACC=$YACC" >> config.mk
+echo "XSHELL_BUILD=$XSHELL_BUILD" >> config.mk
+=======
+echo "LEX=$LEX" >> config.mk
+>>>>>>> 1.115
 echo "AS=$AS" >> config.mk
+if [ "$WINDOWS" = "TRUE" ]; then
+       SUFFIX='.exe'
+else
+       SUFFIX=""
+fi
+echo "SUFFIX=$SUFFIX" >> config.mk
 
 if [ "$WINDOWS" = "TRUE" ]; then
        sed 's_C:/cygwin/_/_g' < config.mk > config.mk.new

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- gtkshell/Makefile   24 Oct 2008 05:50:36 -0000      1.55
+++ gtkshell/Makefile   24 Oct 2008 06:06:18 -0000      1.56
@@ -49,10 +49,10 @@
        cc -o gtkshell $(program) $(GTKFLAGS)
 
 lex.yy.c: guidl.lex
-       $(LEX) -l -nounistd guidl.lex
+       $(LEX) -v -l -nounistd -o lex.yy.c guidl.lex
 
 y.tab.h: lex.yy.c guidl.y
-       yacc -d guidl.y
+       $(YACC) -d -o y.tab.c guidl.y
 
 y.tab.c: y.tab.h
 
@@ -63,6 +63,7 @@
        rm -f gtkshell *.o libgtkshell.a 
 
 install:
-       install -s gtkshell $(PREFIX)/bin
+       mkdir -p $(PREFIX)/bin
+       install -s gtkshell$(SUFFIX) $(PREFIX)/bin
        install gshterm $(PREFIX)/bin
 

Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- gtkshell/add_options.c      19 Dec 2007 18:44:45 -0000      1.56
+++ gtkshell/add_options.c      24 Oct 2008 06:06:18 -0000      1.57
@@ -173,7 +173,9 @@
                $(gsh, manage, terminal);
        }
 #else /* ! HAVE_VTE */
+#ifndef WIN32
        add_command_cb(gsh, counter, argv);
+#endif
 #endif /* HAVE_VTE */
 }
 
@@ -205,7 +207,9 @@
 void
 gsh_add_embedded_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
+#ifndef WIN32
        gsh_add_embedded(gsh, (char *)argv[++(*counter)]);
+#endif
 }
 
 

Index: gtkshell/clock.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/clock.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/clock.c    19 Dec 2007 18:50:07 -0000      1.10
+++ gtkshell/clock.c    24 Oct 2008 06:06:18 -0000      1.11
@@ -44,8 +44,9 @@
        (void)time(&time_value);
        {
                struct tm split_time;
-
+#ifndef WIN32
                (void)localtime_r(&time_value, &split_time);
+#endif
 #define GSHTM(element) split_time.tm_##element
                (void)snprintf(time_string, 
                        GSH_CLOCK_TIME_STRING_SIZE,