[Olsr-cvs] olsrd-current/make Makefile.win32,1.8,1.9

[Thomas Lopatic]

Update of /cvsroot/olsrd/olsrd-current/make
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18287

Modified Files:
	Makefile.win32 
Log Message:
Removed name service plugin from Windows version. Need regex first.

Index: Makefile.win32
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/make/Makefile.win32,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.win32	26 Mar 2007 15:33:32 -0000	1.8
--- Makefile.win32	27 Mar 2007 03:58:47 -0000	1.9
***************
*** 26,31 ****
  OS_LIB_DYNLOAD =
  
! olsr-$(VERS).zip:	gui/win32/Main/Release/Switch.exe \
! 		gui/win32/Shim/Release/Shim.exe \
  		olsrd.exe \
  		olsr_switch.exe \
--- 26,31 ----
  OS_LIB_DYNLOAD =
  
! olsr-$(VERS).zip:	gui/win32/release/Main.exe \
! 		gui/win32/release/Shim.exe \
  		olsrd.exe \
  		olsr_switch.exe \
***************
*** 41,45 ****
  		gui/win32/Main/LQ-Default.olsr \
  		lib/dot_draw/olsrd_dot_draw.dll \
- 		lib/nameservice/olsrd_nameservice.dll \
  		lib/httpinfo/olsrd_httpinfo.dll
  		$(STRIP) olsrd.exe
--- 41,44 ----
***************
*** 47,51 ****
  		$(STRIP) src/cfgparser/olsrd_cfgparser.dll
  		$(STRIP) lib/dot_draw/olsrd_dot_draw.dll
- 		$(STRIP) lib/nameservice/olsrd_nameservice.dll
  		$(STRIP) lib/httpinfo/olsrd_httpinfo.dll
  		rm -rf $(TEMP)/olsr-$(VERS)
--- 46,49 ----
***************
*** 53,58 ****
  		rm -f olsr-$(VERS).zip
  		mkdir $(TEMP)/olsr-$(VERS)
! 		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)
--- 51,56 ----
  		rm -f olsr-$(VERS).zip
  		mkdir $(TEMP)/olsr-$(VERS)
! 		cp gui/win32/release/Main.exe $(TEMP)/olsr-$(VERS)/Switch.exe
! 		cp gui/win32/release/Shim.exe $(TEMP)/olsr-$(VERS)
  		cp olsrd.exe $(TEMP)/olsr-$(VERS)
  		cp olsr_switch.exe $(TEMP)/olsr-$(VERS)
***************
*** 68,81 ****
  		cp gui/win32/Main/LQ-Default.olsr $(TEMP)/olsr-$(VERS)/Default.olsr
  		cp lib/dot_draw/olsrd_dot_draw.dll $(TEMP)/olsr-$(VERS)
- 		cp lib/nameservice/olsrd_nameservice.dll $(TEMP)/olsr-$(VERS)
  		cp lib/httpinfo/olsrd_httpinfo.dll $(TEMP)/olsr-$(VERS)
! 		cd $(TEMP); echo y | cacls olsr-$(VERS) /T /G Everyone:F
! 		cd $(TEMP); zip -q -r olsr-$(VERS).zip olsr-$(VERS)
  		cp $(TEMP)/olsr-$(VERS).zip .
  		rm -rf $(TEMP)/olsr-$(VERS)
  		rm -f $(TEMP)/olsr-$(VERS).zip
  
! olsr-$(VERS)-setup.exe:	gui/win32/Main/Release/Switch.exe \
! 		gui/win32/Shim/Release/Shim.exe \
  		olsrd.exe \
  		olsr_switch.exe \
--- 66,78 ----
  		cp gui/win32/Main/LQ-Default.olsr $(TEMP)/olsr-$(VERS)/Default.olsr
  		cp lib/dot_draw/olsrd_dot_draw.dll $(TEMP)/olsr-$(VERS)
  		cp lib/httpinfo/olsrd_httpinfo.dll $(TEMP)/olsr-$(VERS)
! 		echo y | cacls $(TEMP)\olsr-$(VERS) /T /G Everyone:F
! 		cd "$(TEMP)"; zip -q -r olsr-$(VERS).zip olsr-$(VERS)
  		cp $(TEMP)/olsr-$(VERS).zip .
  		rm -rf $(TEMP)/olsr-$(VERS)
  		rm -f $(TEMP)/olsr-$(VERS).zip
  
! olsr-$(VERS)-setup.exe:	gui/win32/release/Main.exe \
! 		gui/win32/release/Shim.exe \
  		olsrd.exe \
  		olsr_switch.exe \
***************
*** 91,95 ****
  		gui/win32/Main/LQ-Default.olsr \
  		lib/dot_draw/olsrd_dot_draw.dll \
- 		lib/nameservice/olsrd_nameservice.dll \
  		lib/httpinfo/olsrd_httpinfo.dll \
  		gui/win32/Inst/installer.nsi
--- 88,91 ----