GUI file restructuring
authorAndreas Tonnesen <andreto@olsr.org>
Mon, 13 Sep 2004 16:57:21 +0000 (16:57 +0000)
committerAndreas Tonnesen <andreto@olsr.org>
Mon, 13 Sep 2004 16:57:21 +0000 (16:57 +0000)
gui/linux-gtk/CHANGELOG [new file with mode: 0644]
gui/linux-gtk/Makefile [new file with mode: 0644]
gui/linux-gtk/Makefile.win32.in [new file with mode: 0644]
gui/linux-gtk/mkmf.sh [new file with mode: 0755]
gui/win32/Shim/Shim.dsp [new file with mode: 0644]
gui/win32/Shim/Shim.plg [new file with mode: 0644]

diff --git a/gui/linux-gtk/CHANGELOG b/gui/linux-gtk/CHANGELOG
new file mode 100644 (file)
index 0000000..a65c586
--- /dev/null
@@ -0,0 +1,39 @@
+CHANGELOG AS OF 0.2.2
+
+0.2.6 -------------------------------------------------
+
+Minor updates
+
+UPDATES
+Some simple code rewrites and bugfixes.
+Route deletion using IPv6 should work now.
+
+
+0.2.5 -------------------------------------------------
+
+Lots of updates.
+
+REWRITES
+
+Rewritten queuing structure.
+Route information is removed from main tab.
+
+PIGGYBACKING
+
+The front-end now supports piggybacked messages.
+
+
+0.2.2 -------------------------------------------------
+
+HELLO PARSING ERROR
+
+The parsing of HELLO messages didnt handle grous of neighbors
+bigger than 1 if there existed more than one group. This because
+the implementation did not check for several IP addresses but
+just incremented the struct-array index. A kindof ugly hack fixed
+this.
+
+MESSAGE RECIEVING
+
+Recieving of messages not complete - fixed. One could risk just recieving
+half a message the way it used to be implemented.
diff --git a/gui/linux-gtk/Makefile b/gui/linux-gtk/Makefile
new file mode 100644 (file)
index 0000000..9377d05
--- /dev/null
@@ -0,0 +1,26 @@
+CC=    gcc
+#CC=     arm-linux-gcc
+
+CFLAGS= -Wall `pkg-config --cflags gtk+-2.0` #-g #to use GDB
+LFLAGS= `pkg-config --libs gtk+-2.0`
+
+SRCS=  src/main.c src/interface.c src/callbacks.c src/ipc.c \
+       src/packet.c src/nodes.c src/routes.c
+
+OBJS=  src/main.o src/interface.o src/callbacks.o src/ipc.o \
+       src/packet.o src/nodes.o src/routes.o
+
+HDRS=  src/main.h src/interface.h src/callbacks.h src/ipc.h \
+       src/olsr.h src/types.h src/packet.h src/nodes.h \
+       src/pixmaps.h src/routes.h
+
+all:   olsrd-gui
+
+olsrd-gui:     $(OBJS)
+       $(CC) $(LFLAGS) -o bin/$@ $(OBJS)
+
+clean:
+       rm -f $(OBJS)
+
+install:
+       cp ./bin/olsrd-gui /usr/bin/
diff --git a/gui/linux-gtk/Makefile.win32.in b/gui/linux-gtk/Makefile.win32.in
new file mode 100644 (file)
index 0000000..a151b50
--- /dev/null
@@ -0,0 +1,38 @@
+GTKBASE =      ../../gtk
+
+OBJS =         src/main.o \
+               src/interface.o \
+               src/callbacks.o \
+               src/ipc.o \
+               src/packet.o \
+               src/nodes.o \
+               src/routes.o \
+               src/win32/compat.o
+
+%.o:           %.c
+               gcc -mno-cygwin -mms-bitfields -O2 -Wall -c -DWIN32 \
+               -Isrc/win32 \
+                -I$(GTKBASE)/include/gtk-2.0 \
+                -I$(GTKBASE)/include/glib-2.0 \
+                -I$(GTKBASE)/lib/gtk-2.0/include \
+                -I$(GTKBASE)/lib/glib-2.0/include \
+                -I$(GTKBASE)/include/pango-1.0 \
+                -I$(GTKBASE)/include/atk-1.0 \
+                -o$@ $<
+
+olsrd-gui:     $(OBJS)
+               gcc -mno-cygwin -o olsrd-gui.exe $(OBJS) \
+                -lws2_32 \
+                -L$(GTKBASE)/lib \
+                -llibgtk-win32-2.0 \
+                -llibgdk-win32-2.0 \
+                -llibglib-2.0 \
+                -llibgobject-2.0
+
+clean:
+               rm -f olsrd-gui.exe
+               find . -name \*~ -exec rm -f {} \;
+               find src -name \*.o -exec rm -f {} \;
+
+mclean:                clean
+               rm -f Makefile.win32
diff --git a/gui/linux-gtk/mkmf.sh b/gui/linux-gtk/mkmf.sh
new file mode 100755 (executable)
index 0000000..2acc4e2
--- /dev/null
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+srcs="\
+    src/main.c \
+    src/interface.c \
+    src/callbacks.c \
+    src/ipc.c \
+    src/packet.c \
+    src/nodes.c \
+    src/routes.c \
+    src/win32/compat.c \
+    "
+
+rm -f Makefile.win32
+cp Makefile.win32.in Makefile.win32
+
+echo >>Makefile.win32
+echo \# >>Makefile.win32
+echo \# DEPENDENCIES >>Makefile.win32
+echo \# >>Makefile.win32
+
+for f in $srcs; do
+    echo >>Makefile.win32
+    echo \# $f >>Makefile.win32
+    echo >>Makefile.win32
+
+    o=`echo $f | sed -e 's/c$/o/'`
+
+    gcc -MM -MT $o -mno-cygwin -mms-bitfields -O2 -Wall -c -DWIN32 -Isrc/win32 $f >>Makefile.win32
+done
diff --git a/gui/win32/Shim/Shim.dsp b/gui/win32/Shim/Shim.dsp
new file mode 100644 (file)
index 0000000..9a0ec26
--- /dev/null
@@ -0,0 +1,70 @@
+# Microsoft Developer Studio Project File - Name="Shim" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
+\r
+CFG=Shim - Win32 Release\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "Shim.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "Shim.mak" CFG="Shim - Win32 Release"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "Shim - Win32 Release" (based on "Win32 (x86) Console Application")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+RSC=rc.exe\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "Release"\r
+# PROP Intermediate_Dir "Release"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
+# ADD CPP /nologo /MT /W4 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
+# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /entry:"EntryPoint" /subsystem:console /debug /machine:I386 /nodefaultlib\r
+# Begin Target\r
+\r
+# Name "Shim - Win32 Release"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=.\shim.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# End Group\r
+# Begin Group "Resource Files"\r
+\r
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+# End Group\r
+# End Target\r
+# End Project\r
diff --git a/gui/win32/Shim/Shim.plg b/gui/win32/Shim/Shim.plg
new file mode 100644 (file)
index 0000000..385994b
--- /dev/null
@@ -0,0 +1,33 @@
+<html>\r
+<body>\r
+<pre>\r
+<h1>Build Log</h1>\r
+<h3>\r
+--------------------Configuration: Shim - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\Temp\RSP374.tmp" with contents\r
+[\r
+/nologo /MT /W4 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"Release/Shim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c \r
+"C:\Home\Frontend\Shim\shim.c"\r
+]\r
+Creating command line "cl.exe @C:\Temp\RSP374.tmp" \r
+Creating temporary file "C:\Temp\RSP375.tmp" with contents\r
+[\r
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /entry:"EntryPoint" /subsystem:console /incremental:no /pdb:"Release/Shim.pdb" /debug /machine:I386 /nodefaultlib /out:"Release/Shim.exe" \r
+.\Release\shim.obj\r
+]\r
+Creating command line "link.exe @C:\Temp\RSP375.tmp"\r
+<h3>Output Window</h3>\r
+Compiling...\r
+shim.c\r
+C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\rpcasync.h(45) : warning C4115: '_RPC_ASYNC_STATE' : named type definition in parentheses\r
+Linking...\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+Shim.exe - 0 error(s), 1 warning(s)\r
+</pre>\r
+</body>\r
+</html>\r