Skip to content
This repository
Browse code

[wxhaskell-from-cvs @ 2004-02-29 12:46:53 by dleijen]

Fixed installation process on windows98/95

darcs-hash:20040229124653-deb31-73badc93429d9963a0f1afd572721bffd7000c82.gz
  • Loading branch information...
commit 149143a2c99344efa7b6c211cae2e243ed815edd 1 parent 16af806
dleijen authored
2  bin/setcd
... ... @@ -0,0 +1,2 @@
  1 +@ECHO OFF
  2 +SET CURDIR=
13 bin/wxhaskell-register-template.bat
@@ -11,7 +11,13 @@ SET installdir=%1
11 11 GOTO check
12 12
13 13 :noarg
14   -SET installdir=%CD%\..
  14 +COPY /B /Y setcd setcd.bat
  15 +CD ..
  16 +CD >> bin\setcd.bat
  17 +CD bin
  18 +CALL setcd.bat
  19 +DEL setcd.bat
  20 +SET installdir=%CURDIR%
15 21 GOTO check
16 22
17 23 :check
@@ -51,13 +57,14 @@ goto end
51 57
52 58 :notfound
53 59 ECHO error:
54   -ECHO unable to find the wxHaskell packages (wx.pkg)
  60 +ECHO Unable to find the wxHaskell packages (bin\wx.pkg)
  61 +ECHO Maybe the installation directory is not properly specified?
55 62 ECHO.
56 63 GOTO help
57 64
58 65 :help
59 66 ECHO usage:
60   -ECHO wxhaskell-register [^<installdir^>]
  67 +ECHO wxhaskell-register [installdir]
61 68 ECHO.
62 69 ECHO (or just double click on the batch file from the explorer)
63 70 ECHO.
2  bin/wxhaskell-unregister-template.bat
@@ -35,7 +35,7 @@ GOTO end
35 35
36 36 :help
37 37 ECHO usage:
38   -ECHO wxhaskell-unregister [^<installdir^>]
  38 +ECHO wxhaskell-unregister
39 39 ECHO.
40 40 ECHO (or just double click on the batch file from the explorer)
41 41 ECHO.
4 configure
@@ -8,7 +8,7 @@
8 8 # See license.txt for details.
9 9 #------------------------------------------------------------------------
10 10
11   -# $Id: configure,v 1.31 2004/02/20 15:15:54 dleijen Exp $
  11 +# $Id: configure,v 1.32 2004/02/29 12:46:53 dleijen Exp $
12 12
13 13 #--------------------------------------------------------------------
14 14 # Variables
@@ -696,6 +696,8 @@ echo "@SET wxclibname=${wxclibname}-${version}" > config/wxhaskell-unregister-t
696 696 cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
697 697 rm -f config/wxhaskell-unregister-temp
698 698
  699 +echo " - config/setcd"
  700 +cp bin/setcd config/setcd
699 701
700 702 # generate maxosx installer files.
701 703 echo " - config/macosx-install.info"
6 makefile
@@ -4,7 +4,7 @@
4 4 # See "license.txt" for more details.
5 5 #-----------------------------------------------------------------------
6 6
7   -# $Id: makefile,v 1.58 2004/02/19 11:20:09 dleijen Exp $
  7 +# $Id: makefile,v 1.59 2004/02/29 12:46:53 dleijen Exp $
8 8
9 9 #--------------------------------------------------------------------------
10 10 # make [all] - build the libraries (in "lib").
@@ -178,7 +178,7 @@ WXHASKELL-SOURCES= \
178 178 bin/macosx-app-template bin/reimp.exe \
179 179 bin/macosx-builddmg bin/macosx-package \
180 180 bin/wxhaskell-register bin/wxhaskell-unregister \
181   - bin/wxhaskell-register-template.bat bin/wxhaskell-unregister-template.bat
  181 + bin/wxhaskell-register-template.bat bin/wxhaskell-unregister-template.bat bin/setcd
182 182
183 183 SAMPLE-SOURCES= \
184 184 samples/wx/BouncingBalls.hs \
@@ -448,7 +448,7 @@ srcdist-clean:
448 448 bindist: all bindist-clean dist-dirs wxc-bindist wxcore-bindist wx-bindist docdist
449 449 @$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxcore.pkg config/wx.pkg)
450 450 ifeq ($(TOOLKIT),msw)
451   - @$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxhaskell-register.bat config/wxhaskell-unregister.bat)
  451 + @$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxhaskell-register.bat config/wxhaskell-unregister.bat config/setcd)
452 452 else
453 453 @$(call cp-bindist,bin,$(BINDIST-BINDIR),bin/wxhaskell-register bin/wxhaskell-unregister)
454 454 endif
2  samples/wx/Controls.hs
@@ -81,7 +81,7 @@ gui
81 81 , row 0 [floatLeft $ widget c1
82 82 ,floatRight $ row 5 [label "sorted: ", widget c2]]]
83 83 ,tab "listbox" $
84   - container p4 $ margin 10 $ column 5 [ hstretch $ widget sc1
  84 + container p4 $ margin 10 $ column 5 [ hstretch $ dynamic $ widget sc1
85 85 , floatLeft $
86 86 row 0 [widget sl1, widget sl2]]
87 87 ,tab "slider" $

0 comments on commit 149143a

Please sign in to comment.
Something went wrong with that request. Please try again.