wxhaskell-devel

[wxhaskell-devel] darcs patch: Detect haddock version. (and 2 more)

[Eric K. <eri...@gm...>]

Fri Mar  7 23:00:34 GMT 2008  Eric Kow <eri...@gm...>
  * Detect haddock version.

Sat Mar  8 00:02:34 GMT 2008  Eric Kow <eri...@gm...>
  * Get the MacOS X installer to guess some possible GHC locations.
  This seems kinda ugly, but I don't know what else to do.
    ghc-pkg from path
    ghc-pkg in /usr/local/bin
    ghc-pkg in /opt/local/bin
    ghc-pkg in /sw/bin

Sat Mar  8 00:02:40 GMT 2008  Eric Kow <eri...@gm...>
  * Some tweaks to macdist makefile target.

[wxhaskell-devel] darcs patch: Detect haddock version. (and 2 more)

[shelarcy <she...@gm...>]

DarcsURL: http://darcs.haskell.org/wxhaskell/
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"

--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Sat Mar  8 08:00:34 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  Eric Kow <eric.ko=
w...@gm...>
  * Detect haddock version.

Sat Mar  8 13:38:34 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  shelarcy <shelarc=
y...@gm...>
  * Fix: haddock2 support doesn't work on Windows.

Sat Mar  8 15:03:51 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  shelarcy <shelarc=
y...@gm...>
  * List up changes since 0.9.4-1 in changes.txt.

--=_
Content-Type: text/x-darcs-patch; name="detect-haddock-version_.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!


New patches:

[Detect haddock version.
Eric Kow <eri...@gm...>**20080307230034] hunk ./configure 706
-  if test -d "$guessghclibdir"; then
+  haddockversion=3D`haddock --version | sed -e "s|.*version \([0-9]*\)\..*=
|\1|"`
+  if test -d "$guessghclibdir" -a $haddockversion -eq "2"; then

[Fix: haddock2 support doesn't work on Windows.
shelarcy <she...@gm...>**20080308043834] {
hunk ./configure 705
-  guessghclibdir=3D`which ghc | sed -e "s|/bin/ghc|/lib/ghc-$hcversion|"`
+  if test "$cygpathfound"; then
+    guessghclibdir=3D`which ghc | sed -e 's|/bin/ghc||'`
+    normghclibdir=3D"`cygpath -w $guessghclibdir | sed -e 's|\\\\|/|g'`"
+  else
+    guessghclibdir=3D`which ghc | sed -e "s|/bin/ghc|/lib/ghc-$hcversion|"=
`
+    normghclibdir=3D"$guessghclibdir"
+  fi
hunk ./configure 713
-  if test -d "$guessghclibdir" -a $haddockversion -eq "2"; then
-    hdocbases=3D"$hdocbases -B $guessghclibdir"
+  if test -d "$normghclibdir" -a $haddockversion -eq "2"; then
+    hdocbases=3D"$hdocbases -B $normghclibdir"
}

[List up changes since 0.9.4-1 in changes.txt.
shelarcy <she...@gm...>**20080308060351] {
hunk ./changes.txt 7
+Version 0.10.3
+-------------
+Non backward compatible changes:
+- Changed repository to darcs
+- Changed encoding to Unicode
+- Changed the configuration, make files, and install scripts to work =

+  with GHC 6.6, GHC 6.8 or higher
+- Added basic cabal script
+- Added Haddock2 support
+- Added "--with-mediactrl" argument to configure script
+- Added "--with-stc" argument to configure script
+- Added "--hcprof" argument to configure script for builing profiling =

+  version of library
+- Added "--enable-split-objs" argument to configure script
+
+Backward compatible additions:
+- Added CalendarCtrl events
+- Added StyledTextCtrl events
+- Added Drag & Drop events
+- Added TaskBar icon events
+- Added "Wave" type synonym. But "Wave" type is deprecated. Use "Sound"
+  instead of "Wave".
+- Added MediaCtrl control
+- Added "Media" class
+- Changed "play" function to "Media" classes' method
+
+Bugfixes:
+- Fixed bug in listCtrl. "get" returns null string
+- Fixed old example
+- wxcore's BouncingBalls example disabled the close button.
+
hunk ./changes.txt 77
-Version 0.8
--------------
-Non backward compatible changes:
-- Added wildcards argument to the "fileSaveDialog" function.
-- Removed the call to "buttonSetDefault" in the "defaultButton" =

-  property since GTK seems to enlarge the button in that case.
-- Removed alignment argument for text controls
-- Removed sorted and labels argument for choice and combo boxes.
-- Removed sorted argument for listboxes.
-- Added default "stretch" to every toplevel layout, assuring that
-  such layout gets at least all available space assigned.
-- (un)set "maximize box" when "resizeable" is set.
-- Removed default "wxTAB_TRAVERSAL" style on frames (to make the grid
-  work correctly).
-- Renamed "WXCore.WxcClassTypes" to "WXCore.WxcClassInfo".
-- Ignore double buffering on the Mac toolkit to avoid bugs (?) in
-  wxMac 2.5.2.
-
-Backward compatible additions:
-- Added pure "bitmap" and "sound"
-- Added "variable" objects (mutable variables)
-- Added custom control demo.
-- Made "refresh" erase the background too.
-- Added "children" attribute for windows.
-- Added "border" attribute for windows.
-- Added "tabTraversal" attribute for windows.
-- Added wxGrid events and demo (samples/wx/Grid.hs).
-- Improved signatures for wxGrid.
-- Added "changes.txt" file :-)
-- Added "HAS_RADIO_MENU_ITEMS" to "isDefined".
-- Added support for radio menu items.
-- New wxHaskell+HOpenGL sample added to the contributions. Thanks
-  to Shelarcy and Sean Seefried.
-- Added "Align" and "Wrapped" classes to set alignment
-  and wrap mode for text controls.
-- Added "Sorted" class to set the sort mode of choice, combo box,
-  and listbox controls.
-- Added "creation time" attributes that use reflective attributes
-  not compositional (and thus not so nice), but very convenient!
-- Added "entry" as shorthand for "textEntry"
-- Added "SystemColor" and "colorSystem" to get standard system colors.
-- Defaulted background color of "Frame"s to Color3DFace (as a Panel).
-- Made the definition of "Closure" in "wrappers.h" more liberal to =

-  support wxOCaml better.
-- Added "frameCentre" method
-- Huge internal changes: split up wxcClasses in three files and added
-  support for managed objects like bitmaps. Also added checks for NULL =

-  pointers. =

-
-
-Bug fixes:
-- HtmlLinkClicked events are now properly generated.
-- Fixed bug that crashed wxHaskell when a tree control had the focus
-  and a key was pressed. Thanks to Olivier Spier for sending a fix.
-- The "item" attribute of a list control always returned the first
-  item and disregarded the parameter. Thanks to Olivier Spier for =

-  sending a fix.
-
}

Context:

[Data.Time package now only used when available
Mads Lindstroem <mad...@ya...>**20080307211643
 =

 Added test to see if Data.Time package is available. If not we use the
 old System.Time package in stead.
] =

[Add some instructions to the wxcore's BouncingBalls sample, too.
shelarcy <she...@gm...>**20080307172125] =

[Add some instructions to the BouncingBalls sample.
Eric Kow <eri...@gm...>**20080307135913] =

[Adjust size of navigation boxes (homepage).
Eric Kow <eri...@gm...>**20080306141406] =

[Withdraw more support for ghcold (< 6.4)
Eric Kow <eri...@gm...>**20080306141339] =

[Fix dist path in wxhaskell.spec
Eric Kow <eri...@gm...>**20080305184035] =

[Update building instructions (homepage).
Eric Kow <eri...@gm...>**20080305175004] =

[Describe older make use in documentation for cygwin
mi...@al...**20080306151618] =

[Sync Visual Studio's wxc library version to 0.10.3.
shelarcy <she...@gm...>**20080306001813] =

[Fix mispelling of Mads's family name.
Eric Kow <eri...@gm...>**20080305173825
 Sorry!
] =

[Don't call wxcore-clean when building wx.
Eric Kow <eri...@gm...>**20080305173555
 Also, build wxcore in its own directory, so we don't get overlapping with =
wx.
 (I'm guessing that the overlap is why we called wxcore-clean)
] =

[More portable haddocking for Windows.
Eric Kow <eri...@gm...>**20080305172200
 As suggested by shelarcy.
] =

[Last modified (homepage).
Eric Kow <eri...@gm...>**20080305142057] =

[Add XRC as a wishlist task (homepage).
Eric Kow <eri...@gm...>**20080305141841] =

[Add bugs to the dist files.
Eric Kow <eri...@gm...>**20080305141806
 =

 We want people to know we're aware of them, and we want them
 to get the idea of writing bug reports with demonstrators.
] =

[Remove scintilla from wishlist (homepage).
Eric Kow <eri...@gm...>**20080305135436
 Already implemented as far as I know.
] =

[Update repository info (now using darcs, not CVS). (homepage)
Eric Kow <eri...@gm...>**20080305135227] =

[Update list of developers (homepage).
Eric Kow <eri...@gm...>**20080305135206] =

[Update hdocbases to work with haddock2 and ghc 6.8.2
Eric Kow <eri...@gm...>**20080305134826
 I'm not sure which, but this makes it compile on my end.
] =

[Also take advantage of -split-objs for wx.
Eric Kow <eri...@gm...>**20080305113837] =

[(configure/haddock) Set normdocroot on non-Cygwin.
Eric Kow <eri...@gm...>**20080305112720] =

[Update URL for haddock interface files.
Eric Kow <eri...@gm...>**20080305112639] =

[Withdraw haddock support for GHC < 6.2.
Eric Kow <eri...@gm...>**20080305112401
 Portability is nice and all, but this is getting hard to maintain.
] =

[Fix dep: wx-bindist requires wx
Eric Kow <eri...@gm...>**20080305112324] =

[Don't do wildcard expansion in cp-echo.
Eric Kow <eri...@gm...>**20080305111415
 It seems to expand non-wildcard strings like into the empty string.
 Not sure if this breaks anything else, though.
] =

[Bump to 0.10.3.
Eric Kow <eri...@gm...>**20080304224327] =

[Use xargs to feed split objs to $(AR) 25 at a time.
Eric Kow <eri...@gm...>**20080305104856] =

[Add vim modeline for makefile.lib.
Eric Kow <eri...@gm...>**20080305103228
 It's really irritating otherwise; vim thinks it's COBOL.
] =

[Add an --hcflags option to the configure script.
Eric Kow <eri...@gm...>**20080227223152
 For --split-objs and friends.
] =

[Back off from using split-objs for Graphics.UI.WXCore.WxcTypes
Eric Kow <eri...@gm...>**20080304223524
 =

 I don't really understand why we have to do this, but I get undefined
 symbol errors linking sample apps when using this with --enable-split-objs
] =

[Warn about GHC older than 6.4 (to match removed functionality).
Eric Kow <eri...@gm...>**20080304223505] =

[Fix configure bug where ENABLE-SPLITOBJS was being defined.
Eric Kow <eri...@gm...>**20080304170729
 It was being set to 'no' (perhaps the makefile should just
 check if ENABLE-SPLITOBJS=3D'yes')
] =

[Add a wxcREFUSE_MEDIACTRL flag (for the same reason as opengl)
Eric Kow <eri...@gm...>**20080304154047] =

[Create a --enable-split-objs option for configure and makefile.
Eric Kow <eri...@gm...>**20080302233710
 =

 For wxcore, --enable-split-objs calls GHC with -split-objs and
 combines the splitted up .o files in the archive.
] =

[Added testcase for FontFixed problem (1906476)
Mads Lindstroem <mad...@ya...>**20080304060118] =

[Remove List Control test case (bug 1742979 is already fixed on darcs).
shelarcy <she...@gm...>**20080228081614] =

[Fix: bugs/makefile's "make clean" doesn't clean Windows things.
shelarcy <she...@gm...>**20080228082649] =

[Remove parasite configure change.
Eric Kow <eri...@gm...>**20080227134757
 Move around some variables to make more sense.
] =

[Add wx-prof target for Windows binary distribution.
shelarcy <she...@gm...>**20080227035051] =

[Fix bugs in enable wxcore profiling.
shelarcy <she...@gm...>**20080227034845] =

[Specify what OS BoxedCombinator bug fails on.
Eric Kow <eri...@gm...>**20080227135140] =

[Fix bugs makefile under Linux
Eric Kow <eri...@gm...>**20080227134848] =

[Add a configure option to enable wxcore profiling.
Eric Kow <eri...@gm...>**20080226215155] =

[Fix some bugs pointed out by shelarcy on wxcore-prof.
Eric Kow <eri...@gm...>**20080226211227] =

[Add wxcore-prof target for compiling profiling versions of wxcore.
Eric Kow <eri...@gm...>**20080225231635] =

[Remove support for GHC prior to 6.4.
Eric Kow <eri...@gm...>**20080225223554] =

[Maintainer is wxhaskell-devel not wxhaskell-users.
Eric Kow <eri...@gm...>**20080225003139] =

[Change samples/contrib/Camels.hs encoding to UTF-8.
shelarcy <she...@gm...>**20080225142551] =

[Fix: docdist and bindist's wx documents don't link wxcore documents.
shelarcy <she...@gm...>**20080225141105] =

[Fix: configure doesn't find GHC's Haddock document directory on GHC 6.8.x =
or higher.
shelarcy <she...@gm...>**20080225135754] =

[Fix bug pointed out by shelarcy in --enable-mediactrl flag.
Eric Kow <eri...@gm...>**20080225110340
 It was setting the opengl flag instead.
] =

[Add a test case for start >> start (1610984)
Eric Kow <eri...@gm...>**20080225001328] =

[Implement an --enable-mediactrl configure flag.
Eric Kow <eri...@gm...>**20080225000109
 with mediactrl disabled by default.
] =

[Add a diagram of wxhaskell components.
Eric Kow <eri...@gm...>**20080224185557] =

[(OS X) Skip intermediate step of compiling master.o (revisited!)
Eric Kow <eri...@gm...>**20080218225200
 =

 I'm going to quote some mails from Malcolm Wallace on wxhaskel-users in ea=
rly
 2008-02.
 =

 First message:
 > I'm attempting to install wxHaskell from the darcs repo at
 > darcs.haskell.org, under ghc-6.6. on MacOS 10.4.11, with
 > wxMac-2.6.4.
 >
 > The compilation of wxHaskell seems to proceed OK until the link
 > stage:
 >
 >     g++ -r -keep_private_externs -nostdlib -o out/wxc/master.o ....
 >
 > which failed because there is no -lstdc++-static on my machine.  I
 > found the place in the makefile to replace -lstdc++-static with
 > the dynamic -lstdc++, and compilation proceeds further, but not
 > much:
 >
 >      g++ -dynamiclib -install_name\
 > /usr/local/wxhaskell/lib/libwxc-mac2.6.4-0.10.1.dylib -undefined suppres=
s\
 > -flat_namespace -o out/wxc/libwxc-mac2.6.4-0.10.1.dylib out/wxc/master.o=
\
 > -lwx_macu_gl-2.6 -L/usr/local/lib -framework QuickTime -framework IOKit\
 > -framework Carbon -framework Cocoa -framework System -lwx_macu_media-2.6=
\
 > -lwx_macu-2.6
 >     ld: out/wxc/master.o undefined symbol 12387 (__ZTI10wxListBase) can'=
t be a weak definition
 >     /usr/bin/libtool: internal link edit command failed
 >
 > The offending symbol __ZTI10wxListBase looks like it might be a
 > z-encoded symbol from Haskell-land, but I'm not sure how to proceed.
 =

 Second message:
 > A correct build on MacOS 10.4.11 with ghc-6.6 requires that
 > wxWidgets is configured with --enable-shared, and that this patch:
 >
 >     (OS X) Check architecture to use intermediate step of compiling
 >     master.o or not.
 >
 > be darcs unpulled from your local repo.
 >
 > With these tweaks, wxHaskell builds, compiles, and runs the demo
 > programs.
 =

] =

[Eliminate mandatory --with-opengl on Linux.
Eric Kow <eri...@gm...>**20080219171912
 =

 If wxWidgets is compiled with opengl, its header files
  #define wxUSE_GLCANVAS 1
 =

 (See, for example, /usr/lib/wx/include/gtk2-unicode-release-2.6/wx/setup.h=
 on
 Ubuntu Gutsy Gibbon), which causes us to compile glcanvas as if we were go=
ing
 to link against the wxWidgets opengl library.  But since we are not linkin=
g
 against that, the user gets errors compiling their applications.
 =

 Here we introduce an extra preprocessor flag to really insist that no, des=
pite
 what wxWidgets says, we don't want to use GLCANVAS.
] =

[Fix: wxPrint**, wxPreviveFrame** and other function causes link error by u=
ndefined reference on Windows (Visual Studio).
shelarcy <she...@gm...>**20080219034144] =

[Cleanup passing of std/media/stc/opengl to wx-config.
Eric Kow <eri...@gm...>**20080218130345] =

[Export TabPage type synonym (bug 1349475)
Eric Kow <eri...@gm...>**20080218005112] =

[Add ListControl test case (bug 1742979)
Eric Kow <eri...@gm...>**20080218002441
 This might only be a bug on Windows, if at all.
] =

[Add test case textColor attribute (bug 1224727).
Eric Kow <eri...@gm...>**20080218000738] =

[Fix Landscape printing (bug 1168903).
Eric Kow <eri...@gm...>**20080217235724
 =

 Filed on behalf on Lennart Augustson <le...@au...>, who
 submitted a regular Unix patch.
] =

[Add BoxedCombinator test case (bug 1549363)
Eric Kow <eri...@gm...>**20080217233719] =

[Add Sound type's Media class stop method.
shelarcy <she...@gm...>**20080218160511] =

[Fix STC* test cases.
shelarcy <she...@gm...>**20080218155734] =

[Fix: wrapper.h and sound.cpp doesn't care about wxWindows 2.4.2.
shelarcy <she...@gm...>**20080218155605] =

[Sync Visual Studio Project's source flatten away ewxw directories.
shelarcy <she...@gm...>**20080218142201] =

[Add the submenu bug.
Eric Kow <eri...@gm...>**20080217174326] =

[Add NonModalDialog test case (bug #1372529)
Eric Kow <eri...@gm...>**20080217174203] =

[Add a bugs directory for test cases.
Eric Kow <eri...@gm...>**20080217174142] =

[Fix UTF8Sampler test case.
Eric Kow <eri...@gm...>**20080217130553] =

[Fix typo pointed out on bugtracker.
Eric Kow <eri...@gm...>**20080217114303] =

[dos2unix files that have both CRLF and LF line terminators
Eric Kow <eri...@gm...>**20080217095711
 =

 Text editors get confused by these.
 Get rid of trailing whitespace while we're at it.
] =

[Flatten away ewxw directories.
Eric Kow <eri...@gm...>**20080217094929
 =

 This is to mirror the wxc project, making it easier to compare our
 version of wxc with the standalone one.
] =

[Remove unused ewxw files.
Eric Kow <eri...@gm...>**20080217082029
 =

 There is an overlap between ./wxc/src/ewxw and ./wxc/src.  The makefile se=
ems
 to ignore the ones in ewxw.
] =

[Synch Visual Studio Project's wxc library version
shelarcy <she...@gm...>**20080216161420] =

[Synch Visual Studio Project's output dir same as makefile
shelarcy <she...@gm...>**20080216155656] =

[Ugly hack to make setup haddock work without first building.
Eric Kow <eri...@gm...>**20080216135157] =

[Bump to 0.10.2.
Eric Kow <eri...@gm...>**20080216130854] =

[Mimick cabal in placement of haddocks.
Eric Kow <eri...@gm...>**20080216130819] =

[Move cabal stuff to end of makefile.
Eric Kow <eri...@gm...>**20080216125445
 so that all variables are defined.
] =

[Add Hs-Source-Dirs for wxcore.cabal.
Eric Kow <eri...@gm...>**20080216125112
 In case we ever switch to the Simple build type.
] =

[Re-add time package dependency (needed by wxdirect).
Eric Kow <eri...@gm...>**20080216124853] =

[Improve description and synopsis of cabal files.
Eric Kow <eri...@gm...>**20080216124832] =

[Split doc building into wxcore and wx version.
Eric Kow <eri...@gm...>**20080216124746] =

[Modernise haskell98 imports in wxdirect.
Eric Kow <eri...@gm...>**20080216120113] =

[Prefer /usr/local/wxhaskell/bin/wx-config to the one on the path.
Eric Kow <eri...@gm...>**20080216113844
 =

 This makes it easier to install wxhaskell via cabal-install.
 Just set up a symbolic link to point to point to your wxWidgets,
 no need for the --wx-config flag.
] =

[Add some --bindir, --datadir, --libexecdir to configure script.
Eric Kow <eri...@gm...>**20080216113837
 For Cabal.  The last two are ignored.
] =

[Change output dir to 'dist' to mimick cabal.
Eric Kow <eri...@gm...>**20080216104847] =

[Modernise haskell98 imports in wxcore.
Eric Kow <eri...@gm...>**20080216100020] =

[Consolidate build targets which exist purely for the sake of Cabal.
Eric Kow <eri...@gm...>**20080216095845] =

[Fix some dependencies that Ross Paterson pointed out.
Eric Kow <eri...@gm...>**20080215181444] =

[TAG 0.10.1
Eric Kow <eri...@gm...>**20080215173503] =

Patch bundle hash:
4647381d2e047ad5c33d9ac8734950c4a3791f84

--=_--

.

Re: [wxhaskell-devel] darcs patch: Detect haddock version. (and 2 more)

[shelarcy <she...@gm...>]

2008/3/8, shelarcy <she...@gm...>:
> [List up changes since 0.9.4-1 in changes.txt.
> shelarcy <she...@gm...>**20080308060351] {
> hunk ./changes.txt 7
> (snip)

I think I forgot some changes.
Please check and add more changes to changes.txt.

-- 
shelarcy <shelarcy hotmail.co.jp>
http://page.freett.com/shelarcy/

Re: [wxhaskell-devel] darcs patch: Detect haddock version. (and 2 more)

[shelarcy <she...@gm...>]

On Sat, 08 Mar 2008 09:22:35 +0900, Eric Kow <eri...@gm...> wrote:
> [Some tweaks to macdist makefile target.
> Eric Kow <eri...@gm...>**20080308000240] {

I think you must also change this part.

WXHASKELLDMG=$(DIST-OUTDIR)/wxhaskell-bin-$(REL-VERSION).dmg

Because below 3 reasons.

1. Intel Mac's binary is defferent form PowerPC Mac's binaray
2. GHC doesn't support Cross Compiling Haskell program and library.
3. We can't use same name in same SourceForge project file space.

And I added ARCHITECTURE flag for Mac OS X before.
So, how about change WXHASKELLDMG following.

WXHASKELLDMG=$(DIST-OUTDIR)/wxhaskell-$(ARCHITECTURE)-bin-$(REL-VERSION).dmg


Thanks,

-- 
shelarcy <shelarcy    hotmail.co.jp>
http://page.freett.com/shelarcy/

Re: [wxhaskell-devel] darcs patch: Detect haddock version. (and 2 more)

[Eric Y. K. <eri...@gm...>]

On Sat, Mar 08, 2008 at 16:24:45 +0900, shelarcy wrote:
> So, how about change WXHASKELLDMG following.
> 
> WXHASKELLDMG=$(DIST-OUTDIR)/wxhaskell-$(ARCHITECTURE)-bin-$(REL-VERSION).dmg

Done.  Thanks for the patches too.  I've pushed them in and am now
kicking myself for tagging too early

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9