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

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 08/10/26 00:36:10

Modified files:
        .              : Makefile 
        gtkshell       : Makefile add_options.c 
Added files:
        pygsh          : pygui.py 

Log message:
        Fixed compilation on MINGW32.  Added python Tkinter version beginnings.
        Fixed installation on MINGW32.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/Makefile?cvsroot=antiright&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/antiright/pygsh/pygui.py?cvsroot=antiright&rev=1.1

Patches:
Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Makefile    26 Oct 2008 00:18:39 -0000      1.24
+++ Makefile    26 Oct 2008 00:36:09 -0000      1.25
@@ -32,7 +32,7 @@
        cd gtkshell && $(MAKE)
        cd ACE-desktop && $(MAKE)
        $(XSHELL_BUILD) clean
-ifneq ($(OS),MINGW)
+ifneq ($(OS),MINGW32)
        cd xshell && $(MAKE)
        cd rootcat && $(MAKE)
 endif

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- gtkshell/Makefile   26 Oct 2008 00:02:37 -0000      1.57
+++ gtkshell/Makefile   26 Oct 2008 00:36:10 -0000      1.58
@@ -42,6 +42,12 @@
 
 program=main.o 
 
+ifeq ($(OS),MINGW32)
+       INSTALLPROG=cp
+else
+       INSTALLPROG="install -s"
+endif
+
 all: y.tab.c gtkshell
 
 gtkshell: y.tab.h $(objects) $(program)
@@ -62,8 +68,9 @@
 clean: parser-clean
        rm -f gtkshell *.o libgtkshell.a 
 
+
 install:
        mkdir -p $(PREFIX)/bin
-       install -s gtkshell$(SUFFIX) $(PREFIX)/bin
+       $(INSTALLPROG) 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.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- gtkshell/add_options.c      26 Oct 2008 00:02:37 -0000      1.58
+++ gtkshell/add_options.c      26 Oct 2008 00:36:10 -0000      1.59
@@ -205,7 +205,9 @@
 void
 gsh_add_embedded_cb(GSH * gsh, gint * counter, const gchar ** argv)
 {
+#ifndef WIN32
        gsh_swallow_app(gsh, (char *)argv[++(*counter)]);
+#endif
 }
 
 

Index: pygsh/pygui.py
===================================================================
RCS file: pygsh/pygui.py
diff -N pygsh/pygui.py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pygsh/pygui.py      26 Oct 2008 00:36:10 -0000      1.1
@@ -0,0 +1,67 @@
+from Tkinter import *
+import sys
+#import os
+import copy
+import subprocess
+import fileinput
+
+class PyGUIGrid():
+    def __init__(self, max_rows):
+        self.max_rows=max_rows
+        self.row_counter=1
+        self.column_counter=1
+    def pack(self, widget):
+        row_counter+=1
+        if(row_counter > max_rows):
+            row_counter=1
+            column_counter+=1
+        widget.grid(column=column_counter)
+
+class PyGUIButton():
+    def __init__(self, parent, command):
+        pass
+
+class PyGUIArgument():
+    def __init__(self, gui=None, arg=""):
+        self.button=Button(gui,
+                           command=lambda : subprocess.Popen(arg),
+                           text=arg)
+        #self.button.pack({"side": "left"})
+        #PyGUIGrid(
+
+class PyGUIFile():
+    def __init__(self, gui=None, arg=""):
+        for arg in fileinput.input():
+            PyGUIArgument(gui, arg)
+
+class PyGUIMenuBar(Frame):
+    def __init__(self, master=None):
+        pass
+
+class PyGUIMenu():
+    def __init__(self, master=None, label="Menu"):
+        menu_button=MenuButton(menu, text=label)
+        menu_button.pack(side=LEFT, padx="2m")
+        menu_button_menu=Menu(menu_button)
+        pass
+    def add_to(self, menu, label="Button", command=None, args=""):
+        pass
+
+
+class PyGUI(Frame):
+    def parse_command_line(self):
+        first_passed=False
+        for arg in sys.argv:
+            if(first_passed):
+                PyGUIArgument(gui=self, arg=arg)
+            else:
+                first_passed=True
+    def __init__(self, master=None):
+        Frame.__init__(self, master)
+        self.pack()
+        self.parse_command_line()
+
+root = Tk()
+app = PyGUI(master=root)
+app.mainloop()
+