Added olsr_switch.exe and new READMEs to Windows distribution.
authorThomas Lopatic <thomas@lopatic.de>
Thu, 29 Dec 2005 21:26:31 +0000 (21:26 +0000)
committerThomas Lopatic <thomas@lopatic.de>
Thu, 29 Dec 2005 21:26:31 +0000 (21:26 +0000)
Makefile
gui/win32/Frontend.ncb
gui/win32/Frontend.opt
gui/win32/Inst/installer.nsi
make/Makefile.win32

index 44b6100..9028cf4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,9 @@
 # to the project. For more information see the website or contact
 # the copyright holders.
 #
-# $Id: Makefile,v 1.66 2005/11/21 06:27:29 kattemat Exp $
+# $Id: Makefile,v 1.67 2005/12/29 21:26:31 tlopatic Exp $
+
+VERS =         0.4.10pre
 
 TOPDIR = .
 include Makefile.inc
@@ -46,8 +48,6 @@ ifeq ($(OS), win32)
 LDFLAGS +=     -Wl,--out-implib=libolsrd.a -Wl,--export-all-symbols
 endif
 
-VERS =         0.4.10pre
-
 SWITCHDIR =     src/olsr_switch
 CFGDIR =       src/cfgparser
 CFGOBJS =      $(CFGDIR)/oscan.o $(CFGDIR)/oparse.o $(CFGDIR)/olsrd_conf.o
index e00518f..81a38a9 100644 (file)
Binary files a/gui/win32/Frontend.ncb and b/gui/win32/Frontend.ncb differ
index 33a7adb..8ec1ba3 100644 (file)
Binary files a/gui/win32/Frontend.opt and b/gui/win32/Frontend.opt differ
index e225455..6439fb3 100644 (file)
@@ -36,7 +36,7 @@
 ;  to the project. For more information see the website or contact
 ;  the copyright holders.
 ;
-;  $Id: installer.nsi,v 1.13 2005/03/31 18:20:02 tlopatic Exp $
+;  $Id: installer.nsi,v 1.14 2005/12/29 21:26:31 tlopatic Exp $
 ;
 
 Name olsr.org
@@ -55,7 +55,7 @@ UninstPage uninstConfirm
 UninstPage instfiles
 
 Function .onInit
-        MessageBox MB_YESNO "This will install olsr.org 0.4.9 on your computer. Continue?" IDYES NoAbort
+        MessageBox MB_YESNO "This will install olsr.org 0.4.10 on your computer. Continue?" IDYES NoAbort
         Abort
 NoAbort:
 FunctionEnd
@@ -72,9 +72,12 @@ Section "Program Files"
         File ..\Main\Release\Switch.exe
         File ..\Shim\Release\Shim.exe
         File ..\..\..\olsrd.exe
+        File ..\..\..\olsr_switch.exe
         File ..\..\..\src\cfgparser\olsrd_cfgparser.dll
         File /oname=README.txt ..\..\..\README
         File /oname=README-LQ.html ..\..\..\README-Link-Quality.html
+        File /oname=README-Fish-Eye.txt ..\..\..\README-Link-Quality-Fish-Eye.txt
+        File ..\..\..\README-Olsr-Switch.html
         File linux-manual.txt
         File /oname=olsrd.conf.rfc ..\..\..\files\olsrd.conf.win32.rfc
         File /oname=olsrd.conf.lq ..\..\..\files\olsrd.conf.win32.lq
@@ -157,9 +160,12 @@ Section "Uninstall"
         Delete $INSTDIR\Switch.exe
         Delete $INSTDIR\Shim.exe
         Delete $INSTDIR\olsrd.exe
+        Delete $INSTDIR\olsr_switch.exe
        Delete $INSTDIR\olsrd_cfgparser.dll
         Delete $INSTDIR\README.txt
         Delete $INSTDIR\README-LQ.html
+        Delete $INSTDIR\README-Fish-Eye.txt
+        Delete $INSTDIR\README-Olsr-Switch.html
         Delete $INSTDIR\linux-manual.txt
         Delete $INSTDIR\Default.olsr
         Delete $INSTDIR\RFC-Default.olsr
index 9f2f3a2..ae74348 100644 (file)
@@ -28,9 +28,12 @@ OS_LIB_DYNLOAD =
 olsr-$(VERS).zip:      gui/win32/Main/Release/Switch.exe \
                gui/win32/Shim/Release/Shim.exe \
                olsrd.exe \
+               olsr_switch.exe \
                src/cfgparser/olsrd_cfgparser.dll \
                README \
                README-Link-Quality.html \
+               README-Link-Quality-Fish-Eye.txt \
+               README-Olsr-Switch.html \
                gui/win32/Inst/linux-manual.txt \
                files/olsrd.conf.win32.rfc \
                files/olsrd.conf.win32.lq \
@@ -40,6 +43,7 @@ olsr-$(VERS).zip:     gui/win32/Main/Release/Switch.exe \
                lib/nameservice/olsrd_nameservice.dll \
                lib/httpinfo/olsrd_httpinfo.dll
                $(STRIP) olsrd.exe
+               $(STRIP) olsr_switch.exe
                $(STRIP) src/cfgparser/olsrd_cfgparser.dll
                $(STRIP) lib/dot_draw/olsrd_dot_draw.dll
                $(STRIP) lib/nameservice/olsrd_nameservice.dll
@@ -51,9 +55,12 @@ olsr-$(VERS).zip:    gui/win32/Main/Release/Switch.exe \
                cp gui/win32/Main/Release/Switch.exe $(TEMP)/olsr-$(VERS)
                cp gui/win32/Shim/Release/Shim.exe $(TEMP)/olsr-$(VERS)
                cp olsrd.exe $(TEMP)/olsr-$(VERS)
+               cp olsr_switch.exe $(TEMP)/olsr-$(VERS)
                cp src/cfgparser/olsrd_cfgparser.dll $(TEMP)/olsr-$(VERS)
                cp README $(TEMP)/olsr-$(VERS)
                cp README-Link-Quality.html $(TEMP)/olsr-$(VERS)
+               cp README-Link-Quality-Fish-Eye.txt $(TEMP)/olsr-$(VERS)
+               cp README-Olsr-Switch.html $(TEMP)/olsr-$(VERS)
                cp gui/win32/Inst/linux-manual.txt $(TEMP)/olsr-$(VERS)
                cp files/olsrd.conf.win32.rfc $(TEMP)/olsr-$(VERS)/olsrd.conf.rfc
                cp files/olsrd.conf.win32.lq $(TEMP)/olsr-$(VERS)/olsrd.conf.lq
@@ -71,9 +78,12 @@ olsr-$(VERS).zip:    gui/win32/Main/Release/Switch.exe \
 olsr-$(VERS)-setup.exe:        gui/win32/Main/Release/Switch.exe \
                gui/win32/Shim/Release/Shim.exe \
                olsrd.exe \
+               olsr_switch.exe \
                src/cfgparser/olsrd_cfgparser.dll \
                README \
                README-Link-Quality.html \
+               README-Link-Quality-Fish-Eye.txt \
+               README-Olsr-Switch.html \
                gui/win32/Inst/linux-manual.txt \
                files/olsrd.conf.win32.rfc \
                files/olsrd.conf.win32.lq \
@@ -84,6 +94,7 @@ olsr-$(VERS)-setup.exe:       gui/win32/Main/Release/Switch.exe \
                lib/httpinfo/olsrd_httpinfo.dll \
                gui/win32/Inst/installer.nsi
                $(STRIP) olsrd.exe
+               $(STRIP) olsr_switch.exe
                $(STRIP) src/cfgparser/olsrd_cfgparser.dll
                $(STRIP) lib/dot_draw/olsrd_dot_draw.dll
                $(STRIP) lib/nameservice/olsrd_nameservice.dll