Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[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
View
@@ -0,0 +1,2 @@
+@ECHO OFF
+SET CURDIR=
13 bin/wxhaskell-register-template.bat
View
@@ -11,7 +11,13 @@ SET installdir=%1
GOTO check
:noarg
-SET installdir=%CD%\..
+COPY /B /Y setcd setcd.bat
+CD ..
+CD >> bin\setcd.bat
+CD bin
+CALL setcd.bat
+DEL setcd.bat
+SET installdir=%CURDIR%
GOTO check
:check
@@ -51,13 +57,14 @@ goto end
:notfound
ECHO error:
-ECHO unable to find the wxHaskell packages (wx.pkg)
+ECHO Unable to find the wxHaskell packages (bin\wx.pkg)
+ECHO Maybe the installation directory is not properly specified?
ECHO.
GOTO help
:help
ECHO usage:
-ECHO wxhaskell-register [^<installdir^>]
+ECHO wxhaskell-register [installdir]
ECHO.
ECHO (or just double click on the batch file from the explorer)
ECHO.
2  bin/wxhaskell-unregister-template.bat
View
@@ -35,7 +35,7 @@ GOTO end
:help
ECHO usage:
-ECHO wxhaskell-unregister [^<installdir^>]
+ECHO wxhaskell-unregister
ECHO.
ECHO (or just double click on the batch file from the explorer)
ECHO.
4 configure
View
@@ -8,7 +8,7 @@
# See license.txt for details.
#------------------------------------------------------------------------
-# $Id: configure,v 1.31 2004/02/20 15:15:54 dleijen Exp $
+# $Id: configure,v 1.32 2004/02/29 12:46:53 dleijen Exp $
#--------------------------------------------------------------------
# Variables
@@ -696,6 +696,8 @@ echo "@SET wxclibname=${wxclibname}-${version}" > config/wxhaskell-unregister-t
cat config/wxhaskell-unregister-temp bin/wxhaskell-unregister-template.bat | sed -e "s|\$|\\r|g" > config/wxhaskell-unregister.bat
rm -f config/wxhaskell-unregister-temp
+echo " - config/setcd"
+cp bin/setcd config/setcd
# generate maxosx installer files.
echo " - config/macosx-install.info"
6 makefile
View
@@ -4,7 +4,7 @@
# See "license.txt" for more details.
#-----------------------------------------------------------------------
-# $Id: makefile,v 1.58 2004/02/19 11:20:09 dleijen Exp $
+# $Id: makefile,v 1.59 2004/02/29 12:46:53 dleijen Exp $
#--------------------------------------------------------------------------
# make [all] - build the libraries (in "lib").
@@ -178,7 +178,7 @@ WXHASKELL-SOURCES= \
bin/macosx-app-template bin/reimp.exe \
bin/macosx-builddmg bin/macosx-package \
bin/wxhaskell-register bin/wxhaskell-unregister \
- bin/wxhaskell-register-template.bat bin/wxhaskell-unregister-template.bat
+ bin/wxhaskell-register-template.bat bin/wxhaskell-unregister-template.bat bin/setcd
SAMPLE-SOURCES= \
samples/wx/BouncingBalls.hs \
@@ -448,7 +448,7 @@ srcdist-clean:
bindist: all bindist-clean dist-dirs wxc-bindist wxcore-bindist wx-bindist docdist
@$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxcore.pkg config/wx.pkg)
ifeq ($(TOOLKIT),msw)
- @$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxhaskell-register.bat config/wxhaskell-unregister.bat)
+ @$(call cp-bindist,config,$(BINDIST-BINDIR),config/wxhaskell-register.bat config/wxhaskell-unregister.bat config/setcd)
else
@$(call cp-bindist,bin,$(BINDIST-BINDIR),bin/wxhaskell-register bin/wxhaskell-unregister)
endif
2  samples/wx/Controls.hs
View
@@ -81,7 +81,7 @@ gui
, row 0 [floatLeft $ widget c1
,floatRight $ row 5 [label "sorted: ", widget c2]]]
,tab "listbox" $
- container p4 $ margin 10 $ column 5 [ hstretch $ widget sc1
+ container p4 $ margin 10 $ column 5 [ hstretch $ dynamic $ widget sc1
, floatLeft $
row 0 [widget sl1, widget sl2]]
,tab "slider" $
Please sign in to comment.
Something went wrong with that request. Please try again.