From d8c270dcecc20b8084cb0463490ef68c8f88518f Mon Sep 17 00:00:00 2001
From: fcolin
Date: Tue, 18 Apr 2006 11:54:14 +0000
Subject: retour au protocol V3

---
 src/Makefile.win32 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/Makefile.win32')

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index dab95dd..52f024e 100755
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -17,7 +17,7 @@
 
 # change this in version.h too !!!!
 MAJOR=3
-MINOR=7
+MINOR=8
 
 PCREINC = -I "C:\Program Files\GnuWin32\include" #`pcre-config --cflags`
 PCRELIB = "C:\Program Files\GnuWin32\lib\libpcre.lib" #`pcre-config --libs`
@@ -45,7 +45,6 @@ REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT)
 # see below
 CHANNEL = -DTCL_CHANNEL_INTEGRATION 
 
-
 OBJ = ivyloop.obj timer.obj ivysocket.obj ivy.obj 
 
 # WINDOWS add ivyloop.obj if TCL_CHANNEL_INTEGRATION is not set
-- 
cgit v1.1


From 6bf117656574521545694a1a4e5169755077631e Mon Sep 17 00:00:00 2001
From: fcolin
Date: Wed, 19 Apr 2006 08:28:14 +0000
Subject: correction de probleme potentiel en multithread ( Ada rejeu ) ajout
 d'un warning en cas de client bloquant si la varaiable d'env IVY_DEBUG_SEND
 est positionne

---
 src/Makefile.win32 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/Makefile.win32')

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index 52f024e..f7aec5a 100755
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -19,8 +19,11 @@
 MAJOR=3
 MINOR=8
 
-PCREINC = -I "C:\Program Files\GnuWin32\include" #`pcre-config --cflags`
-PCRELIB = "C:\Program Files\GnuWin32\lib\libpcre.lib" #`pcre-config --libs`
+PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4" 
+PCRELIB = "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\lib\libpcre.lib" #`pcre-config --libs`
+
+#PCREINC = -I "C:\Program Files\GnuWin32\include" #`pcre-config --cflags`
+#PCRELIB = "C:\Program Files\GnuWin32\lib\libpcre.lib" #`pcre-config --libs`
 
 PCRE_OPT = PCRE_CASELESS
 REGCOMP_OPT = REG_ICASE
@@ -34,7 +37,7 @@ PCREOBJ =
 
 #CC=gcc
 #CFLAGS = -g -Wall
-CFLAGS = -DWIN32 -nologo
+CFLAGS = -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -nologo
 #LIBTOOL=ar q # linux and solaris
 #LIBTOOL=libtool -static -o
 LIBTOOL=lib -nologo /out:
-- 
cgit v1.1


From d20808b04feb328272a35ee2b03f4ae19db23fbe Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 20 Apr 2006 15:51:37 +0000
Subject: cleanup DEBUG code

---
 src/Makefile.win32 | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'src/Makefile.win32')

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index f7aec5a..0d05a89 100755
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -19,7 +19,7 @@
 MAJOR=3
 MINOR=8
 
-PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4" 
+PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\\" 
 PCRELIB = "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\lib\libpcre.lib" #`pcre-config --libs`
 
 #PCREINC = -I "C:\Program Files\GnuWin32\include" #`pcre-config --cflags`
@@ -37,13 +37,13 @@ PCREOBJ =
 
 #CC=gcc
 #CFLAGS = -g -Wall
-CFLAGS = -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -nologo
+CFLAGS = /W3 /DWIN32 /D_CRT_SECURE_NO_DEPRECATE /nologo
 #LIBTOOL=ar q # linux and solaris
 #LIBTOOL=libtool -static -o
-LIBTOOL=lib -nologo /out:
+LIBTOOL=lib /nologo /out:
 
 #REGEXP = -DGNU_REGEXP  -DREGCOMP_OPT=$(REGCOMP_OPT) # deprecated !
-REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT)
+REGEXP= /DUSE_PCRE_REGEX /DPCRE_OPT=$(PCRE_OPT)
 # on activeTCL , set #define CHANNEL to null, and add ivyloop.obj in the ivytcl target,
 # see below
 CHANNEL = -DTCL_CHANNEL_INTEGRATION 
@@ -51,11 +51,11 @@ CHANNEL = -DTCL_CHANNEL_INTEGRATION
 OBJ = ivyloop.obj timer.obj ivysocket.obj ivy.obj 
 
 # WINDOWS add ivyloop.obj if TCL_CHANNEL_INTEGRATION is not set
-TARGETS = ivyprobe ivyperf 
+TARGETS = ivyprobe.exe ivyperf.exe 
 TARGETLIBS=libivy.dll
 
 .c.obj:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) /c $*.c
 
 all: static-libs commands shared-libs
 
@@ -66,34 +66,31 @@ shared-libs: $(TARGETLIBS)
 commands: $(TARGETS)
 
 ivy.obj: ivy.c
-	$(CC) -c $(CFLAGS) $(REGEXP) $(PCREINC) ivy.c
+	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivy.c
 
 
-ivyprobe: ivyprobe.obj libivy.lib
+ivyprobe.exe: ivyprobe.obj libivy.lib
 	$(CC)  $(CFLAGS) -o $@ ivyprobe.obj libivy.lib wsock32.lib $(PCRELIB)
 
 ivyprobe.obj : ivyprobe.c 
-	$(CC)  $(CFLAGS) $(REGEXP) $(PCREINC) -c ivyprobe.c -o $@ 
+	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivyprobe.c
 	
-ivyperf: ivyperf.obj libivy.lib
-	$(CC)  $(CFLAGS) -o $@ ivyperf.obj libivy.lib wsock32.lib $(PCRELIB)
+ivyperf.exe: ivyperf.obj libivy.lib
+	$(CC) $(CFLAGS) -o $@ ivyperf.obj libivy.lib wsock32.lib $(PCRELIB)
 
 ivyperf.obj : ivyperf.c
-	$(CC)  $(CFLAGS) $(REGEXP) $(PCREINC) -c ivyperf.c -o $@
+	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivyperf.c
 
 
 libivy.lib: $(OBJ)
 	del /f $@
 	$(LIBTOOL)$@ $(OBJ)
 
-
-# TODO this PCREOBJ is a dirty hack
-
 libivy.dll: $(OBJ)
-	$(CC) /dll -o $@ $(OBJ) $(PCRELIB)
+	$(CC) /dll /out: $@ $(OBJ) $(PCRELIB)
 
 clean:
-	-del /f $(TARGETS) $(TARGETLIBS) *.obj *.a *.dll *~
+	-del /f $(TARGETS) $(TARGETLIBS) *.obj *.lib *.dll *~
 
 
 
-- 
cgit v1.1


From 8b42932b4ec978040acf341e69cd7b037721b24f Mon Sep 17 00:00:00 2001
From: fcolin
Date: Fri, 21 Apr 2006 12:49:19 +0000
Subject: separation regexp en module ( bug arg num edbute a 1 )

---
 src/Makefile.win32 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.win32')

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index 0d05a89..651110e 100755
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -48,7 +48,7 @@ REGEXP= /DUSE_PCRE_REGEX /DPCRE_OPT=$(PCRE_OPT)
 # see below
 CHANNEL = -DTCL_CHANNEL_INTEGRATION 
 
-OBJ = ivyloop.obj timer.obj ivysocket.obj ivy.obj 
+OBJ = ivyloop.obj timer.obj ivysocket.obj ivy.obj ivybind.obj
 
 # WINDOWS add ivyloop.obj if TCL_CHANNEL_INTEGRATION is not set
 TARGETS = ivyprobe.exe ivyperf.exe 
-- 
cgit v1.1


From 2cf893c0c34d50a68a27e1704b38f2facc10c9bc Mon Sep 17 00:00:00 2001
From: fcolin
Date: Fri, 21 Apr 2006 15:51:55 +0000
Subject: suppression de l'indirection sur les fonction channel et renomage !

---
 src/Makefile.win32 | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/Makefile.win32')

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index 651110e..aab6ccd 100755
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -20,7 +20,7 @@ MAJOR=3
 MINOR=8
 
 PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\\" 
-PCRELIB = "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\lib\libpcre.lib" #`pcre-config --libs`
+PCRELIB = Debug\pcre.lib
 
 #PCREINC = -I "C:\Program Files\GnuWin32\include" #`pcre-config --cflags`
 #PCRELIB = "C:\Program Files\GnuWin32\lib\libpcre.lib" #`pcre-config --libs`
@@ -48,7 +48,7 @@ REGEXP= /DUSE_PCRE_REGEX /DPCRE_OPT=$(PCRE_OPT)
 # see below
 CHANNEL = -DTCL_CHANNEL_INTEGRATION 
 
-OBJ = ivyloop.obj timer.obj ivysocket.obj ivy.obj ivybind.obj
+OBJ = ivyloop.obj timer.obj ivysocket.obj ivy.obj ivybuffer.obj ivybind.obj getopt.obj
 
 # WINDOWS add ivyloop.obj if TCL_CHANNEL_INTEGRATION is not set
 TARGETS = ivyprobe.exe ivyperf.exe 
@@ -65,21 +65,18 @@ shared-libs: $(TARGETLIBS)
 
 commands: $(TARGETS)
 
-ivy.obj: ivy.c
-	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivy.c
+ivybind.obj: ivybind.c
+	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivybind.c
 
 
 ivyprobe.exe: ivyprobe.obj libivy.lib
-	$(CC)  $(CFLAGS) -o $@ ivyprobe.obj libivy.lib wsock32.lib $(PCRELIB)
+	$(CC)  $(CFLAGS) /Fe$@ ivyprobe.obj libivy.lib wsock32.lib $(PCRELIB)
 
 ivyprobe.obj : ivyprobe.c 
 	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivyprobe.c
 	
 ivyperf.exe: ivyperf.obj libivy.lib
-	$(CC) $(CFLAGS) -o $@ ivyperf.obj libivy.lib wsock32.lib $(PCRELIB)
-
-ivyperf.obj : ivyperf.c
-	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivyperf.c
+	$(CC) $(CFLAGS) /Fe$@ ivyperf.obj libivy.lib wsock32.lib $(PCRELIB)
 
 
 libivy.lib: $(OBJ)
-- 
cgit v1.1


From 7f8a7e581928fa721bf83f484ac22adf0cc7c44b Mon Sep 17 00:00:00 2001
From: fourdan
Date: Tue, 4 Jul 2006 14:35:55 +0000
Subject: Pas de sectarisme...

---
 src/Makefile.win32 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.win32')

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index aab6ccd..535011f 100755
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -17,7 +17,7 @@
 
 # change this in version.h too !!!!
 MAJOR=3
-MINOR=8
+MINOR=9
 
 PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\\" 
 PCRELIB = Debug\pcre.lib
-- 
cgit v1.1


From 0a280c3a27b03a1267d1057604df000218e26416 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Fri, 22 Sep 2006 09:24:02 +0000
Subject: remove some WIN32 warning add module intervalRegexp in Makefile.win32

---
 src/Makefile.win32 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.win32')

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index 535011f..8bcdb97 100755
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -48,7 +48,7 @@ REGEXP= /DUSE_PCRE_REGEX /DPCRE_OPT=$(PCRE_OPT)
 # see below
 CHANNEL = -DTCL_CHANNEL_INTEGRATION 
 
-OBJ = ivyloop.obj timer.obj ivysocket.obj ivy.obj ivybuffer.obj ivybind.obj getopt.obj
+OBJ = intervalRegexp.obj ivyloop.obj timer.obj ivysocket.obj ivy.obj ivybuffer.obj ivybind.obj getopt.obj
 
 # WINDOWS add ivyloop.obj if TCL_CHANNEL_INTEGRATION is not set
 TARGETS = ivyprobe.exe ivyperf.exe 
-- 
cgit v1.1