Permalink
Browse files

[wxhaskell-from-cvs @ 2003-07-22 14:24:39 by dleijen]

MacOS X aanpassingen

darcs-hash:20030722142442-deb31-4ef89772521c568ca137eb6cd0453f8089ff9e13.gz
  • Loading branch information...
1 parent 35f9000 commit ebf61ef76e1d9877830f385e0fc6fea0ebe9d3ae dleijen committed Jul 22, 2003
Showing with 25 additions and 19 deletions.
  1. +7 −3 bin/macosx-app
  2. +5 −7 bin/wxhaskell-register
  3. +12 −8 makefile
  4. +1 −1 samples/wx/Process.hs
View
@@ -8,7 +8,7 @@
# Copyright (c) 2003, Daan Leijen, Arthur Baars
#------------------------------------------------------------------------
-# $Id: macosx-app,v 1.2 2003/07/21 19:29:38 dleijen Exp $
+# $Id: macosx-app,v 1.3 2003/07/22 14:24:42 dleijen Exp $
arg=""
# variables
@@ -48,7 +48,11 @@ fi
# wxwindows library name
mainversion="`echo \"$version\" | sed -e \"s|\\.[0-9]\$||\"`"
-libname="libwx_mac-$mainversion"
+if test "$version" = "2.4.1"; then
+ libname="libwx_mac-2.4.0"
+else
+ libname="libwx_mac-$mainversion"
+fi
# nicely shown names
eprefix_doc="<prefix>"
@@ -203,4 +207,4 @@ cat > $bundle/Info.plist << EOF
<true/>
</dict>
</plist>
-EOF
+EOF
View
@@ -1,7 +1,7 @@
#!/bin/sh
-# default installation directory is the current directory.
-installdir="`pwd`"
+# default installation directory
+installdir="/usr/local/lib"
# parse command-line arguments
while : ; do
@@ -36,14 +36,12 @@ done
if test ! -e "${installdir}/wxh.pkg"; then
echo "error: " 1>&2
echo " Unable to find: ${installdir}/wxh.pkg" 1>&2
- echo " Please run this program from the wxHaskell installation directory" 1>&2
- echo " or specify the installation directory on the command line." 1>&2
+ echo " Please specify the installation directory on the command line." 1>&2
+ echo " For example: wxhaskell-register --installdir=/usr/local/lib" 1>&2
echo "" 1>&2
- echo "usage:" 1>&2
- echo " wxhaskell-register [--installdir=<dir>]" 1>&2
exit 2
fi
# register the packages.
env installdir=${installdir} ghc-pkg -u -i ${installdir}/wxh.pkg
-env installdir=${installdir} ghc-pkg -u -i ${installdir}/wx.pkg
+env installdir=${installdir} ghc-pkg -u -i ${installdir}/wx.pkg
View
@@ -4,7 +4,7 @@
# See "license.txt" for more details.
#-----------------------------------------------------------------------
-# $Id: makefile,v 1.14 2003/07/21 08:48:14 dleijen Exp $
+# $Id: makefile,v 1.15 2003/07/22 14:24:39 dleijen Exp $
#--------------------------------------------------------------------------
# make [all] - build the libraries (in "lib").
@@ -338,7 +338,7 @@ ROOTDIR =$(word $(words $(TOPDIRS)),$(TOPDIRS))
# zip commands
# usage: $(call zip-bindist,<relative directory>,<files>)
# usage: $(call zip-srcdist,<local files>)
-zip-add =echo zipping: $(1); $(ZIP) -9 $(TOPDIR)/$(1) $(2)
+zip-add =echo zipping: $(1); $(ZIP) -y -9 $(TOPDIR)/$(1) $(2)
zip-docdist =$(CD) $(1); $(call zip-add,$(DIST-DOC), $(call relative-to,$(1),$(2)))
zip-bindist =$(CD) $(1); $(call zip-add,$(DIST-BIN), $(call relative-to,$(1),$(2)))
@@ -361,12 +361,12 @@ srcdist: dist-dirs wxc-dist wxd-dist wxh-dist wx-dist
# binary distribution
bindist: all dist-dirs wxc-bindist wxh-bindist wx-bindist
@$(call zip-bindist,config, wxh.pkg wx.pkg)
- @$(call zip-bindist,bin, wxhaskell-register)
+ @$(call zip-bindist,bin,wxhaskell-register)
ifeq ($(DLL),.dll)
- @$(call zip-bindist,bin, wxhaskell-register.bat)
+ @$(call zip-bindist,bin,wxhaskell-register.bat)
endif
ifeq ($(DLL),.dylib)
- @$(call zip-bindist,bin, macosx-app)
+ @$(call zip-bindist,bin,macosx-app)
endif
@@ -617,7 +617,11 @@ endif
@-$(RMDIR) $(WXC-OUTDIR)/bin
else
ifneq ($(WXWINLIB),)
- @$(call zip-bindist,$(dir $(WXWINLIB)),$(notdir $(WXWINLIB)))
+ @$(call zip-bindist,$(dir $(WXWINLIB)),$(basename $(notdir $(WXWINLIB)))*$(DLL))
+ifeq ($(TOOLKIT),mac)
+ @$(call zip-bindist,$(dir $(WXWINLIB)),$(basename $(notdir $(WXWINLIB)))*.r)
+ @$(call zip-bindist,$(dir $(WXWINLIB)),$(basename $(notdir $(WXWINLIB)))*.rsrc)
+endif
endif
@$(call zip-bindist,$(WXC-OUTDIR), $(WXC-LIB))
endif
@@ -647,7 +651,7 @@ $(basename $(WXC-LIB)).so: $(WXC-OBJS)
# dynamic link library on macOSX: generates single .so file
$(basename $(WXC-LIB)).dylib: $(WXC-OBJS)
$(CXX) -r -keep_private_externs -nostdlib -o $(WXC-OUTDIR)/master.o $^
- $(CXX) -dynamiclib -undefined suppress -flat_namespace -o $@ $(WXC-OUTDIR)/master.o $(filter-out %.a,$(WXC-LIBS))
+ $(CXX) -dynamiclib -install_name $@ -undefined suppress -flat_namespace -o $@ $(WXC-OUTDIR)/master.o $(filter-out %.a,$(WXC-LIBS))
$(RM) -f $(WXC-OUTDIR)/master.o
# create an object file from source files
@@ -697,4 +701,4 @@ endif
# generate documentation with haddock
$(DOCFILE): prologue.txt $(DOCSOURCES)
- $(HDOC) $(HDOCFLAGS) $(DOCSOURCES)
+ $(HDOC) $(HDOCFLAGS) $(DOCSOURCES)
View
@@ -59,4 +59,4 @@ gui
onReceive message txt streamStatus
- = message txt
+ = message txt

0 comments on commit ebf61ef

Please sign in to comment.