[htoolkit-cvs] port configure,1.15,1.16 makefile,1.24,1.25

[<kr_...@us...>]

Update of /cvsroot/htoolkit/port
In directory sc8-pr-cvs1:/tmp/cvs-serv13801/port

Modified Files:
	configure makefile 
Log Message:
better configure/makefile scripts for Windows


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/port/configure,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** configure	16 Jul 2003 22:11:06 -0000	1.15
--- configure	17 Jul 2003 17:34:25 -0000	1.16
***************
*** 36,41 ****
  	echo " -hcpkg         <package compiler (= ghc-pkg)>"
  	echo " -package       <local package configuration file>"
! 	echo " -ffdir         <ffi include directory, contains 'HsFFI.h'>"
! 	echo " -htoolkit      <HToolkit sources directory>"
  	echo " -haddock       <haddock documentation tool>"
  	echo " -haddock-libs  <haddock library directory>"
--- 36,40 ----
  	echo " -hcpkg         <package compiler (= ghc-pkg)>"
  	echo " -package       <local package configuration file>"
! 	echo " -incdir        <ffi include directory, contains 'HsFFI.h'>"
  	echo " -haddock       <haddock documentation tool>"
  	echo " -haddock-libs  <haddock library directory>"
***************
*** 127,133 ****
  version="`$hc --numeric-version`"
  case $version in
!   0* | 1* |  2* |  3* |  4* |  5.00* |  5.01* |  5.02* |  5.03* |  5.04 |  5.04.0 |  5.04.1) echo "WARNING:"
  	  echo " you seem to have an older ghc installed, namely $version"
!           echo " ghc versions prior to 5.04.2 have gc bugs that make port applications *crash*."
  	  echo "";;
    5.04.*) ;;
--- 126,132 ----
  version="`$hc --numeric-version`"
  case $version in
!   0* | 1* |  2* |  3* |  4* |  5*) echo "WARNING:"
  	  echo " you seem to have an older ghc installed, namely $version"
!           echo " ghc versions prior to 6.0 are not supported"
  	  echo "";;
    5.04.*) ;;
***************
*** 136,140 ****
    *)	 echo "warning:"
  	 echo " unable to recognise the ghc version ($version ?)"
-          echo " ghc versions prior to 5.04.2 have gc bugs that make port applications crash."
  	 echo "";;
  esac
--- 135,138 ----
***************
*** 196,208 ****
      hdocdir="`which $hdoc | sed -e 's|/bin/haddock||' -e 's|.exe||'`"
    fi
! 
!   # just for windows: haddock doesn't like /home
!   case "$hdocdir" in
!     /home*)  if test ! -z "$HOMEDRIVE"; then
! 	       hdocdir="`echo $hdocdir | sed -e 's|/home||'`"
! 	       hdocdir="$HOMEDRIVE$hdocdir"
! 	     fi;;
!   esac
! 
  
    if test -z "$hdoclibs"; then
--- 194,199 ----
      hdocdir="`which $hdoc | sed -e 's|/bin/haddock||' -e 's|.exe||'`"
    fi
!   
!   hdocdir="`echo $hdocdir | sed -e 's%^/cygdrive/\(.\)/%\1:/%'`"
  
    if test -z "$hdoclibs"; then
***************
*** 334,342 ****
  
  # Determine top-level directory
! curdir="`pwd`"
  
  # create list of extra include directories needed, comma seperated and quoted.
  # expects $cincflags to be in the form: -Idir1 -Idir2 ...
! incdirs=\"$curdir/src/include\"
  incopts=""
  for flag in $cincflags; do
--- 325,334 ----
  
  # Determine top-level directory
! curdir="`echo $(pwd) | sed -e 's%^/cygdrive/\(.\)/%\1:/%'`"
! 
  
  # create list of extra include directories needed, comma seperated and quoted.
  # expects $cincflags to be in the form: -Idir1 -Idir2 ...
! incdirs=""
  incopts=""
  for flag in $cincflags; do
***************
*** 347,368 ****
  done
  
- # just for windows: ghc-pkg doesn't like /home
- case "$curdir" in
-   /home*)  if test ! -z "$HOMEDRIVE"; then
- 	     curdir="`echo $curdir | sed -e 's|/home||'`"
- 	     curdir="$HOMEDRIVE$curdir"
- 	   fi;;
- esac
- 
  # Create directories
  echo "creating output directories:"
  echo " - config"
  mkdir -p config
- echo " - build/Port"
- mkdir -p build build/Port 
  echo " - build/cbits/$target"
  mkdir -p build/cbits build/cbits/$target
! echo " - imports/Graphics/UI/Port"
! mkdir -p imports imports/Graphics imports/Graphics/UI imports/Graphics/UI/Port 
  
  # Finish generated files
--- 339,350 ----
  done
  
  # Create directories
  echo "creating output directories:"
  echo " - config"
  mkdir -p config
  echo " - build/cbits/$target"
  mkdir -p build/cbits build/cbits/$target
! echo " - build/Graphics/UI/Port"
! mkdir -p build build/Graphics build/Graphics/UI build/Graphics/UI/Port 
  
  # Finish generated files

Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/port/makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** makefile	16 Jul 2003 22:11:06 -0000	1.24
--- makefile	17 Jul 2003 17:34:25 -0000	1.25
***************
*** 67,71 ****
  # library and doc output
  BUILDDIR  = build
- IMPORTDIR = imports
  DOCDIR	  = doc
  
--- 67,70 ----
***************
*** 75,79 ****
  
  # object files output
! HOUTDIR	    = $(BUILDDIR)
  COUTDIR	    = $(BUILDDIR)/cbits/$(GUILIB)
  
--- 74,78 ----
  
  # object files output
! HOUTDIR	    = $(BUILDDIR)/Graphics/UI
  COUTDIR	    = $(BUILDDIR)/cbits/$(GUILIB)
  
***************
*** 115,119 ****
  
  # main, object files, dependencies and hi files
! MAINLIB	    = libHS$(MAIN).a
  MAINOBJ	    = HS$(MAIN).o
  
--- 114,118 ----
  
  # main, object files, dependencies and hi files
! MAINLIB	    = $(BUILDDIR)/libHS$(MAIN).a
  MAINOBJ	    = HS$(MAIN).o
  
***************
*** 144,153 ****
  	install -d $(LIBDIR)/imports/Graphics/UI/Port
  	install -d $(LIBDIR)/include/port
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include/port
! 	install -m 644 imports/Graphics/UI/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 imports/Graphics/UI/Port/*.hi $(LIBDIR)/imports/Graphics/UI/Port
! 	install -m 644 $(MAINLIB) $(LIBDIR)/$(MAINLIB)
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include
  	install -m 644 src/include/*.h $(LIBDIR)/include/port
  	$(RM) $(LIBDIR)/include/port/HsPort.h
  	$(RM) $(LIBDIR)/$(MAINOBJ)
--- 143,154 ----
  	install -d $(LIBDIR)/imports/Graphics/UI/Port
  	install -d $(LIBDIR)/include/port
+ 	install -d $(LIBDIR)/doc/html/port
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include/port
! 	install -m 644 $(HOUTDIR)/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 $(HOUTDIR)/Port/*.hi $(LIBDIR)/imports/Graphics/UI/Port
! 	install -m 644 $(MAINLIB) $(LIBDIR)
  	install -m 644 src/include/HsPort.h $(LIBDIR)/include
  	install -m 644 src/include/*.h $(LIBDIR)/include/port
+ 	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/port
  	$(RM) $(LIBDIR)/include/port/HsPort.h
  	$(RM) $(LIBDIR)/$(MAINOBJ)
***************
*** 168,172 ****
  
  $(HOBJS): $(HOUTDIR)/%.o: %.hs
! 	$(HC) -o $@ -package-name port -ohi $(IMPORTDIR)/Graphics/UI/$(*D)/$(*F).hi -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) $($(*F)_OPTIONS) -i$(IMPORTDIR) $(INCDIRS)
  	@# move stub files
  	@-if test -f $(<D)/$(*F)_stub.h; then $(MV) $(<D)/$(*F)_stub.[ch] $(HOUTDIR)/$(*D); fi   
--- 169,173 ----
  
  $(HOBJS): $(HOUTDIR)/%.o: %.hs
! 	$(HC) -o $@ -package-name port -ohi $(BUILDDIR)/Graphics/UI/$(*D)/$(*F).hi -odir $(HOUTDIR)/$(*D) -c $<  $(HC-OPTIONS) $($(*F)_OPTIONS) -i$(BUILDDIR) $(INCDIRS)
  	@# move stub files
  	@-if test -f $(<D)/$(*F)_stub.h; then $(MV) $(<D)/$(*F)_stub.[ch] $(HOUTDIR)/$(*D); fi   
***************
*** 222,242 ****
  
  # extra commands: clean up all directories and show linecounts.
! clean:	cleanLIB cleanDOC cleanHS cleanC 
! 
! cleanLIB:
  	$(RM) $(MAINLIB)
! 	$(RM) $(MAINOBJ)
! 
! cleanHS:
! 	@# clean up HOUTDIR
  	$(RM) $(HOUTDIR)/*.*
  	$(RM) $(HOUTDIR)/Port/*.*
- 
- cleanC:
  	$(RM) $(COUTDIR)/*.*
! 
! cleanDOC:
! 	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css
! 	$(RM) $(DOCFILE)
  		
  # documentation
--- 223,235 ----
  
  # extra commands: clean up all directories and show linecounts.
! clean:
  	$(RM) $(MAINLIB)
! 	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css $(DOCDIR)/*.haddock
  	$(RM) $(HOUTDIR)/*.*
  	$(RM) $(HOUTDIR)/Port/*.*
  	$(RM) $(COUTDIR)/*.*
! 	$(RMDIR) $(HOUTDIR)
! 	$(RMDIR) $(HOUTDIR)/Port
! 	$(RMDIR) $(COUTDIR)
  		
  # documentation