[Cpri-develop] cpri/misc makefile.bcc,1.3,1.4 makefile.dj,1.3,1.4 makefile.mgw,1.4,1.5 makefile.uni,1.3,1.4 makefile.vc,1.7,1.8 makefile.ver,1.4,1.5 zipup.sh,1.4,1.5

[<ch...@us...>]

Update of /cvsroot/cpri/cpri/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv21716/misc

Modified Files:
	makefile.bcc makefile.dj makefile.mgw makefile.uni makefile.vc 
	makefile.ver zipup.sh 
Log Message:
Updated change log

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/makefile.bcc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** makefile.bcc	4 Jun 2003 18:32:35 -0000	1.3
--- makefile.bcc	7 Dec 2003 21:09:56 -0000	1.4
***************
*** 73,77 ****
  
  
- 
  # -------- Check that environment path variables are set. --------
  
--- 73,76 ----
***************
*** 79,86 ****
--- 78,95 ----
  
  ifeq ($(OS),Windows_NT)
+ # true 32 bit OS:
+ ifeq ($(TERM),msys)
  WINSYSDIR = $(SYSTEMROOT)
+ else
+ WINSYSDIR = $(SystemRoot)
+ endif
  WINSUBDIR = system32
  else
+ # DOS based windows:
+ ifeq ($(TERM),msys)
  WINSYSDIR = $(WINDIR)
+ else
+ WINSYSDIR = $(windir)
+ endif
  WINSUBDIR = system
  endif
***************
*** 132,136 ****
--- 141,159 ----
  
  
+ ifdef UNIX_TOOLS
  # -------- Set up mktext --------
+ ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
+ ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X))
+ CPRI_DAT = $(subst \,/,$(CPRI_DAT_X))
+ CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X))
+ CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X))
+ CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X))
+ CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X))
+ CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X))
+ CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X))
+ TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
+ TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
+ MKTEXT = $(subst \,/,$(MKTEXT_X))
+ else
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
  ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X))
***************
*** 145,148 ****
--- 168,173 ----
  TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
  MKTEXT = $(subst /,\,$(MKTEXT_X))
+ endif
+ 
  
  # -------- give a sensible default target for make without any args --------

Index: makefile.dj
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/makefile.dj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** makefile.dj	12 Apr 2003 09:54:45 -0000	1.3
--- makefile.dj	7 Dec 2003 21:09:56 -0000	1.4
***************
*** 110,113 ****
--- 110,128 ----
  
  
+ ifdef UNIX_TOOLS
+ # -------- Set up mktext --------
+ ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
+ ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X))
+ CPRI_DAT = $(subst \,/,$(CPRI_DAT_X))
+ CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X))
+ CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X))
+ CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X))
+ CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X))
+ CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X))
+ CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X))
+ TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
+ TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
+ MKTEXT = $(subst \,/,$(MKTEXT_X))
+ else
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
  ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X))
***************
*** 122,125 ****
--- 137,141 ----
  TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
  MKTEXT = $(subst /,\,$(MKTEXT_X))
+ endif
  
  

Index: makefile.mgw
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/makefile.mgw,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.mgw	4 Jun 2003 18:32:35 -0000	1.4
--- makefile.mgw	7 Dec 2003 21:09:56 -0000	1.5
***************
*** 69,76 ****
--- 69,86 ----
  
  ifeq ($(OS),Windows_NT)
+ # true 32 bit OS:
+ ifeq ($(TERM),msys)
  WINSYSDIR = $(SYSTEMROOT)
+ else
+ WINSYSDIR = $(SystemRoot)
+ endif
  WINSUBDIR = system32
  else
+ # DOS based windows:
+ ifeq ($(TERM),msys)
  WINSYSDIR = $(WINDIR)
+ else
+ WINSYSDIR = $(windir)
+ endif
  WINSUBDIR = system
  endif
***************
*** 102,107 ****
  
  
! 
  # -------- Set up mktext --------
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
  ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X))
--- 112,130 ----
  
  
! ifdef UNIX_TOOLS
  # -------- Set up mktext --------
+ ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
+ ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X))
+ CPRI_DAT = $(subst \,/,$(CPRI_DAT_X))
+ CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X))
+ CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X))
+ CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X))
+ CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X))
+ CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X))
+ CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X))
+ TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
+ TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
+ MKTEXT = $(subst \,/,$(MKTEXT_X))
+ else
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
  ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X))
***************
*** 116,119 ****
--- 139,143 ----
  TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
  MKTEXT = $(subst /,\,$(MKTEXT_X))
+ endif
  
  

Index: makefile.uni
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/makefile.uni,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** makefile.uni	23 May 2003 12:40:10 -0000	1.3
--- makefile.uni	7 Dec 2003 21:09:56 -0000	1.4
***************
*** 96,111 ****
  
  # -------- Set up mktext --------
! ALLEGRO_DAT = $(ALLEGRO_DAT_X)
! ALLEGRO_DAT2C = $(ALLEGRO_DAT2C_X)
! CPRI_DAT = $(CPRI_DAT_X)
! CPRI_DAT_C = $(CPRI_DAT_C_X)
! CPRI_DAT_H = $(CPRI_DAT_H_X)
! CPRI_ICONS = $(CPRI_ICONS_X)
! CPRI_ICONS_C = $(CPRI_ICONS_C_X)
! CPRI_ICONS_H = $(CPRI_ICONS_H_X)
! CPRI_LABELS = $(CPRI_LABELS_X)
! TEXT_SOURCES  = $(TEXT_SOURCES_X)
! TEXT_HEADERS = $(TEXT_HEADERS_X)
! MKTEXT = $(MKTEXT_X)
  
  # -------- Give a sensible default target for make without any args. --------
--- 96,112 ----
  
  # -------- Set up mktext --------
! ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
! ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X))
! CPRI_DAT = $(subst \,/,$(CPRI_DAT_X))
! CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X))
! CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X))
! CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X))
! CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X))
! CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X))
! CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X))
! TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
! TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
! MKTEXT = $(subst \,/,$(MKTEXT_X))
! 
  
  # -------- Give a sensible default target for make without any args. --------

Index: makefile.vc
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/makefile.vc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.vc	4 Jun 2003 18:32:35 -0000	1.7
--- makefile.vc	7 Dec 2003 21:09:56 -0000	1.8
***************
*** 78,85 ****
--- 78,95 ----
  
  ifeq ($(OS),Windows_NT)
+ # true 32 bit OS:
+ ifeq ($(TERM),msys)
  WINSYSDIR = $(SYSTEMROOT)
+ else
+ WINSYSDIR = $(SystemRoot)
+ endif
  WINSUBDIR = system32
  else
+ # DOS based windows:
+ ifeq ($(TERM),msys)
  WINSYSDIR = $(WINDIR)
+ else
+ WINSYSDIR = $(windir)
+ endif
  WINSUBDIR = system
  endif
***************
*** 122,127 ****
  
  
! 
  # -------- Set up mktext --------
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
  ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X))
--- 132,150 ----
  
  
! ifdef UNIX_TOOLS
  # -------- Set up mktext --------
+ ALLEGRO_DAT = $(subst \,/,$(ALLEGRO_DAT_X))
+ ALLEGRO_DAT2C = $(subst \,/,$(ALLEGRO_DAT2C_X))
+ CPRI_DAT = $(subst \,/,$(CPRI_DAT_X))
+ CPRI_DAT_C = $(subst \,/,$(CPRI_DAT_C_X))
+ CPRI_DAT_H = $(subst \,/,$(CPRI_DAT_H_X))
+ CPRI_ICONS = $(subst \,/,$(CPRI_ICONS_X))
+ CPRI_ICONS_C = $(subst \,/,$(CPRI_ICONS_C_X))
+ CPRI_ICONS_H = $(subst \,/,$(CPRI_ICONS_H_X))
+ CPRI_LABELS = $(subst \,/,$(CPRI_LABELS_X))
+ TEXT_SOURCES  = $(subst \,/,$(TEXT_SOURCES_X))
+ TEXT_HEADERS = $(subst \,/,$(TEXT_HEADERS_X))
+ MKTEXT = $(subst \,/,$(MKTEXT_X))
+ else
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
  ALLEGRO_DAT2C = $(subst /,\,$(ALLEGRO_DAT2C_X))
***************
*** 136,139 ****
--- 159,164 ----
  TEXT_HEADERS = $(subst /,\,$(TEXT_HEADERS_X))
  MKTEXT = $(subst /,\,$(MKTEXT_X))
+ endif
+ 
  
  # -------- Find Allegro, runner and makedoc. --------

Index: makefile.ver
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/makefile.ver,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.ver	12 Apr 2003 09:54:46 -0000	1.4
--- makefile.ver	7 Dec 2003 21:09:56 -0000	1.5
***************
*** 7,10 ****
  # Shared library versions for Unix
  # todo: this is unused at the moment
! shared_version = 0.9.1
  shared_major_minor = 0.9
--- 7,10 ----
  # Shared library versions for Unix
  # todo: this is unused at the moment
! shared_version = 0.9.2
  shared_major_minor = 0.9

Index: zipup.sh
===================================================================
RCS file: /cvsroot/cpri/cpri/misc/zipup.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zipup.sh	12 Apr 2003 09:54:46 -0000	1.4
--- zipup.sh	7 Dec 2003 21:09:56 -0000	1.5
***************
*** 12,17 ****
  
  # note: these are patched by fixver.sh script.
! zipversion=091
! tgzversion=0.9.1
  
  if [ "$1" != "-q" ]; then
--- 12,17 ----
  
  # note: these are patched by fixver.sh script.
! zipversion=092
! tgzversion=0.9.2
  
  if [ "$1" != "-q" ]; then