Menu
▾
▴
jazzplusplus-updates — SVN commit message list
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
(58) |
Apr
(100) |
May
(92) |
Jun
(12) |
Jul
|
Aug
|
Sep
(5) |
Oct
(1) |
Nov
(26) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(31) |
Feb
(20) |
Mar
(1) |
Apr
|
May
(5) |
Jun
(10) |
Jul
|
Aug
(2) |
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
| 2010 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(36) |
May
(10) |
Jun
|
Jul
(38) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(56) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(13) |
Dec
(2) |
| 2013 |
Jan
(30) |
Feb
|
Mar
(43) |
Apr
(28) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(10) |
Nov
(2) |
Dec
|
| 2014 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pst...@us...> - 2008-12-15 05:36:56
|
Revision: 643
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=643&view=rev
Author: pstieber
Date: 2008-12-15 05:36:52 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
Removed white space from the end of a line.
Modified Paths:
--------------
trunk/jazz/src/PortMidiPlayer.cpp
Modified: trunk/jazz/src/PortMidiPlayer.cpp
===================================================================
--- trunk/jazz/src/PortMidiPlayer.cpp 2008-12-08 06:07:12 UTC (rev 642)
+++ trunk/jazz/src/PortMidiPlayer.cpp 2008-12-15 05:36:52 UTC (rev 643)
@@ -125,7 +125,7 @@
if (pPmDeviceInfo && pPmDeviceInfo->output)
{
- wxString Name =
+ wxString Name =
wxString(pPmDeviceInfo->interf, wxConvISO8859_1) +
wxT(", ") +
wxString(pPmDeviceInfo->name, wxConvISO8859_1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-12-08 06:07:14
|
Revision: 642
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=642&view=rev
Author: pstieber
Date: 2008-12-08 06:07:12 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
Applied a patch provided by Donald B. Moore that updated the wxWidgets version to 2.8.9, adds tex2rtf and changed the case of SourceForge.
Modified Paths:
--------------
web/htdocs/download/index.php
Modified: web/htdocs/download/index.php
===================================================================
--- web/htdocs/download/index.php 2008-12-08 06:01:33 UTC (rev 641)
+++ web/htdocs/download/index.php 2008-12-08 06:07:12 UTC (rev 642)
@@ -32,18 +32,19 @@
same goes for release tarballs : there are none, not yet. We encourage people
to get a little involved, give building the Jazz++ source from our Subversion
respository a try, and report on what they find. Things like this help
-eventuate release binary and tarball dates, however at present (May 2008) it
+eventuate release binary and tarball dates, however at present (Nov 2008) it
is impossible to accurately predict when in the future these dates might be.
</P>
<P>
If you still want to just give the currently available 'minimal functionality'
source tarball a try, you will first need to compile and install a non-stock
-build of wxWidgets 2.8.8 to build Jazz++ itself. View the
-<a href="/buildingwx/">Building wxWidgets</a> page for details.
+build of wxWidgets 2.8.9 to build Jazz++ itself, and the tex2rtf utility which
+Jazz++ depends on. View the <a href="/buildingwx/">Building wxWidgets</a> page
+and <a href="/buildingtex2rtf/">Building Tex2rtf</a> for details.
</P>
<P>
<A href="http://sourceforge.net/project/showfiles.php?group_id=104252">Download
-the Jazz++ source tarball from sourceforge.</A>
+the Jazz++ source tarball from SourceForge.</A>
</P>
<?php
require_once('../include/footer.php');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-12-08 06:01:35
|
Revision: 641
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=641&view=rev
Author: pstieber
Date: 2008-12-08 06:01:33 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
Applied a patch provided by Donald B. Moore that discusses current documentation development.
Modified Paths:
--------------
web/htdocs/documentation/index.php
Modified: web/htdocs/documentation/index.php
===================================================================
--- web/htdocs/documentation/index.php 2008-12-08 05:37:18 UTC (rev 640)
+++ web/htdocs/documentation/index.php 2008-12-08 06:01:33 UTC (rev 641)
@@ -48,9 +48,19 @@
<h3>Using Jazz++ with Linux on the x86/x86_64 PC</h3>
<p>
Sections of this documentation are being added to right now.
+For Linux users, the highlights of new content includes sections
+on setting up a MIDI 'softsynth' (as used by the Jazz++ developers)
+and how to resolve 'real time' performance issues under Linux.
+</p>
+<p>
The lastest versions of this and other Jazz++ documentation
-is always included in the current svn source code. As time
-permits, links to that documentation will appear here.
+is always included in the current svn source code. To access
+this documentation (as part of Jazz++ itself), click on Help/Contents
+menu item - a window will appear allowing you to browse the current
+inbuilt user manual.
+
+As time permits and content matures, links to all documentation will appear
+here.
</p>
<p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-12-08 05:37:27
|
Revision: 640
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=640&view=rev
Author: pstieber
Date: 2008-12-08 05:37:18 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
Applied a patch provided by Bonald B. Moore that adds tex2rtf to the instructions and makes a wording change.
Modified Paths:
--------------
web/htdocs/buildingjazz/index.php
Modified: web/htdocs/buildingjazz/index.php
===================================================================
--- web/htdocs/buildingjazz/index.php 2008-12-08 05:12:48 UTC (rev 639)
+++ web/htdocs/buildingjazz/index.php 2008-12-08 05:37:18 UTC (rev 640)
@@ -17,11 +17,14 @@
<H2>Building Jazz++</H2>
<P>
Jazz++ uses a non-stock build of the
-<A NAME="wxWidgetsLink" HREF="http://www.wxwidgets.org">wxWidgets</A> library.
+<A NAME="wxWidgetsLink" HREF="http://www.wxwidgets.org">wxWidgets</A> library, and
+depends on the <a NAME="tex2rtfLink" HREF="/tex2rtf">tex2rtf</a> utility to build.
See
<A NAME="wxWidgetsLink" HREF="/buildingwx">the wxWidgets build instructions</A>
-to create and install the non-stock wxWidgets build. This non-stock wxWidgets
-build must be available before using the instructions on this page.
+and <a NAME="tex2rtfLink" HREF="/buildingtex2rtf">the tex2rtf build instructions</a>
+to create and install the non-stock wxWidgets build and tex2rtf utility. This non-stock
+wxWidgets build and tex2rtf utility must be available before using the instructions
+on this page.
</P>
<H3>Building Jazz++ for Windows</H3>
@@ -77,7 +80,7 @@
<LI>
Checkout the HEAD version of Jazz++ using the following command.
-You must have a Subversion client loaded on your machine.
+You must have a Subversion client installed on your machine.
<PRE>
svn checkout https://jazzplusplus.svn.sourceforge.net/svnroot/jazzplusplus/trunk/jazz jazz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-12-08 05:12:51
|
Revision: 639
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=639&view=rev
Author: pstieber
Date: 2008-12-08 05:12:48 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
Applied a patch provided by Donald B. Moore that indicates the build has been tested on Debian 4.0.
Modified Paths:
--------------
web/htdocs/buildingwx/index.php
Modified: web/htdocs/buildingwx/index.php
===================================================================
--- web/htdocs/buildingwx/index.php 2008-12-08 04:59:51 UTC (rev 638)
+++ web/htdocs/buildingwx/index.php 2008-12-08 05:12:48 UTC (rev 639)
@@ -23,8 +23,9 @@
version of wxWidgets was compiled for Windows, Linux, and the Mac. The Windows
build was generated using Visual Studio. Either Visual Studio .NET 2005 or
Visual Studio .NET 2008 can be used on Windows. The Linux install was tested
-using Fedora 9 using GCC 4.3.0 and Mandriva 2008.0 using GCC 4.2.2. The Mac
-build was tested using Mac OS X 10.5.2 and GCC 4.0.1.
+using Fedora 9 using GCC 4.3.0, Mandriva 2008.0 using GCC 4.2.2, and Debian 4.0
+(i386 & amd64) using gcc-4.1.2. The Mac build was tested using Mac OS X 10.5.2
+and GCC 4.0.1.
</P>
<H3>Building wxWidgets for Windows</H3>
@@ -299,7 +300,7 @@
</LI>
<LI>
-Install the release version of the wxWidgets build last to insure this version
+Install the release version of the wxWidgets build last to ensure this version
is the default configuration. If you installed the debug version last, simply
re-install the release version. You can run the following command to determine
the default configuration.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-12-08 04:59:54
|
Revision: 638
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=638&view=rev
Author: pstieber
Date: 2008-12-08 04:59:51 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
Applied a patch provided by Donald B. Moore. Switched the subversion link with the building wxWidgets link.
Modified Paths:
--------------
web/htdocs/include/leftnav.php
Modified: web/htdocs/include/leftnav.php
===================================================================
--- web/htdocs/include/leftnav.php 2008-11-17 21:52:03 UTC (rev 637)
+++ web/htdocs/include/leftnav.php 2008-12-08 04:59:51 UTC (rev 638)
@@ -6,8 +6,8 @@
<p><a href="/documentation/">Documentation</a></p>
<p><a href="/faq/">FAQ</a></p>
<p><a href="http://sourceforge.net/projects/jazzplusplus">Sourceforge Project</a></p>
+<p><a href="/subversion/">Subversion</a></p>
<p><a href="/buildingwx/">Building wxWidgets</a></p>
-<p><a href="/subversion/">Subversion</a></p>
<p><a href="/tex2rtf/">Tex2RTF</a></p>
<p><a href="/buildingtex2rtf/">Building Tex2RTF</a></p>
<p><a href="/buildingjazz/">Building Jazz++</a></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-17 21:55:22
|
Revision: 637
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=637&view=rev
Author: pstieber
Date: 2008-11-17 21:52:03 +0000 (Mon, 17 Nov 2008)
Log Message:
-----------
Changed the HelpFile directory installation on Linux to prefix/share/Jazz++/HelpFiles.
Modified Paths:
--------------
trunk/jazz/src/HelpFiles/Makefile.am
trunk/jazz/src/HelpFiles/images/Makefile.am
trunk/jazz/src/JazzPlusPlusApplication.cpp
Modified: trunk/jazz/src/HelpFiles/Makefile.am
===================================================================
--- trunk/jazz/src/HelpFiles/Makefile.am 2008-11-17 19:38:17 UTC (rev 636)
+++ trunk/jazz/src/HelpFiles/Makefile.am 2008-11-17 21:52:03 UTC (rev 637)
@@ -10,7 +10,7 @@
libphony_a_SOURCES = jazz.tex
-helpdir = ${prefix}/bin/HelpFiles
+helpdir = ${prefix}/share/Jazz++/HelpFiles
make-install-dirs:
-if test '!' -d $(helpdir); then mkdir -p $(helpdir); fi
Modified: trunk/jazz/src/HelpFiles/images/Makefile.am
===================================================================
--- trunk/jazz/src/HelpFiles/images/Makefile.am 2008-11-17 19:38:17 UTC (rev 636)
+++ trunk/jazz/src/HelpFiles/images/Makefile.am 2008-11-17 21:52:03 UTC (rev 637)
@@ -1,4 +1,4 @@
-helpimagesdir = ${prefix}/bin/HelpFiles/images
+helpimagesdir = ${prefix}/share/Jazz++/HelpFiles/images
make-install-dirs :
-if test '!' -d $(helpimagesdir); then mkdir -p $(helpimagesdir); fi
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-17 19:38:17 UTC (rev 636)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-17 21:52:03 UTC (rev 637)
@@ -159,14 +159,14 @@
// Show it and tell the application that it's our main window
SetTopWindow(mpTrackFrame);
- // Get the current working directory and append a directory separator.
- wxString CurrentWorkingDirectory =
- ::wxGetCwd() + wxFileName::GetPathSeparator();
-
// This code should be distributed with a HelpFiles subdirectory under
- // the directory the executable is stored in.
+ // the directory the executable is stored in on Windows and under the
+ // ${prefix}/shared/${appname} on Linux.
wxString HelpFileDirectoryGuess =
- CurrentWorkingDirectory + "HelpFiles" + wxFileName::GetPathSeparator();
+ wxStandardPaths::Get().GetDataDir() +
+ wxFileName::GetPathSeparator() +
+ "HelpFiles" +
+ wxFileName::GetPathSeparator();
// Attempt to obtain the path to the help file from configuration data.
wxString HelpFilePath;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-17 19:38:22
|
Revision: 636
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=636&view=rev
Author: pstieber
Date: 2008-11-17 19:38:17 +0000 (Mon, 17 Nov 2008)
Log Message:
-----------
Updated a comment.
Modified Paths:
--------------
trunk/jazz/conf/Makefile.am
Modified: trunk/jazz/conf/Makefile.am
===================================================================
--- trunk/jazz/conf/Makefile.am 2008-11-16 17:30:13 UTC (rev 635)
+++ trunk/jazz/conf/Makefile.am 2008-11-17 19:38:17 UTC (rev 636)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
# This files specifies Jazz++ data files to install. The default location on
-# a Linux box is /usr/local/share/jazz, which is the gnu dictated place for
+# a Linux box is /usr/local/share/Jazz++, which is the gnu dictated place for
# such files. jazz.cfg could be tailored after the configure options (make a
# jazz.cfg.in and use var substitution).
pkgdata_DATA = jazz.mid \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-16 17:30:18
|
Revision: 635
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=635&view=rev
Author: pstieber
Date: 2008-11-16 17:30:13 +0000 (Sun, 16 Nov 2008)
Log Message:
-----------
Moved the PATH and LD_LIBRARY_PATH instruction to the top of the list.
Modified Paths:
--------------
web/htdocs/buildingwx/index.php
Modified: web/htdocs/buildingwx/index.php
===================================================================
--- web/htdocs/buildingwx/index.php 2008-11-16 05:33:37 UTC (rev 634)
+++ web/htdocs/buildingwx/index.php 2008-11-16 17:30:13 UTC (rev 635)
@@ -183,7 +183,29 @@
</OL>
<h3>Building wxWidgets for Linux</h3>
+
<OL>
+<LI>
+Before we start the build process, set your <TT>PATH</TT> and
+<TT>LD_LIBRARY_PATH</TT> environment variables so your shell will find the
+non-stock wxWidgets binaries and libraries that we are about to create and
+install. Adding the following lines in <TT>.bash_profile</TT> will do the
+trick.
+
+<PRE>
+export PATH=/usr/local/wx289/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/wx289/lib:$LD_LIBRARY_PATH
+</PRE>
+
+After adding the above lines to your <TT>.bash_profile</TT>
+file, it is necessary to reload your bash environment to make these changes
+available. Use the following command to accomplish this.
+
+<PRE>
+source .bash_profile
+</PRE>
+</LI>
+
<LI>Create a directory under your home directory. I typically use
<TT>OutsideSource</TT> and change directory to that location.
@@ -277,27 +299,6 @@
</LI>
<LI>
-Make sure your <TT>PATH</TT> and <TT>LD_LIBRARY_PATH</TT> environment
-variables are set to find the non-stock wxWidgets binaries and libraries just
-created before building Tex2RTF and Jazz++. Adding the following lines in
-<TT>.bash_profile</TT> will do the trick.
-
-<PRE>
-export PATH=/usr/local/wx289/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/wx289/lib:$LD_LIBRARY_PATH
-</PRE>
-
-After adding the above lines to your <TT>.bash_profile</TT>
-file, it is necessary to reload your bash environment to make these changes
-available. Use the following command to accomplish this.
-
-<PRE>
-source .bash_profile
-</PRE>
-
-</LI>
-
-<LI>
Install the release version of the wxWidgets build last to insure this version
is the default configuration. If you installed the debug version last, simply
re-install the release version. You can run the following command to determine
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-16 05:33:40
|
Revision: 634
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=634&view=rev
Author: pstieber
Date: 2008-11-16 05:33:37 +0000 (Sun, 16 Nov 2008)
Log Message:
-----------
Switched two items.
Modified Paths:
--------------
web/htdocs/buildingwx/index.php
Modified: web/htdocs/buildingwx/index.php
===================================================================
--- web/htdocs/buildingwx/index.php 2008-11-16 00:39:06 UTC (rev 633)
+++ web/htdocs/buildingwx/index.php 2008-11-16 05:33:37 UTC (rev 634)
@@ -277,17 +277,6 @@
</LI>
<LI>
-Install the release version of the wxWidgets build last to insure this version
-is the default configuration. If you installed the debug version last, simply
-re-install the release version. You can run the following command to determine
-the default configuration.
-
-<PRE>
-wx-config --list
-</PRE>
-</LI>
-
-<LI>
Make sure your <TT>PATH</TT> and <TT>LD_LIBRARY_PATH</TT> environment
variables are set to find the non-stock wxWidgets binaries and libraries just
created before building Tex2RTF and Jazz++. Adding the following lines in
@@ -307,6 +296,18 @@
</PRE>
</LI>
+
+<LI>
+Install the release version of the wxWidgets build last to insure this version
+is the default configuration. If you installed the debug version last, simply
+re-install the release version. You can run the following command to determine
+the default configuration.
+
+<PRE>
+wx-config --list
+</PRE>
+</LI>
+
</OL>
<h3>Building wxWidgets for Mac OS X 10.5.2</h3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-16 00:39:11
|
Revision: 633
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=633&view=rev
Author: pstieber
Date: 2008-11-16 00:39:06 +0000 (Sun, 16 Nov 2008)
Log Message:
-----------
Updated build instructions to assume root privileges.
Modified Paths:
--------------
web/htdocs/buildingjazz/index.php
web/htdocs/buildingtex2rtf/index.php
web/htdocs/buildingwx/index.php
Modified: web/htdocs/buildingjazz/index.php
===================================================================
--- web/htdocs/buildingjazz/index.php 2008-11-16 00:30:22 UTC (rev 632)
+++ web/htdocs/buildingjazz/index.php 2008-11-16 00:39:06 UTC (rev 633)
@@ -64,27 +64,14 @@
</P>
<H3>Building Jazz++ for Linux</H3>
-<P>
-I'm going to assume you do not have root privileges on your Linux box. Given
-this assumption, we'll create a directory called <TT>Jazz++</TT> under your
-home directory. This directory will hold the source tree that will be obtained
-using Subversion, a build directory call <TT>Build</TT> and a test installation
-directory called <TT>TestInstall</TT> that will be generated by the build
-sequence. The need for the source directory is obvious. Separating the build
-directory from the source tree will allow you to remove the build output
-without damaging the source tree. The installation directory will be created
-during the build process, and its location will remove the need for root
-privileges on your Linux box.
-</P>
<OL>
<LI>
-Create a <TT> Jazz++</TT> directory under your home directory and change
-directory to the newly created directory.
+Change directory to the <TT>OutsideSource</TT> you created when building
+wxWidgets.
<PRE>
cd
-mkdir Jazz++
-cd Jazz++
+cd OutsideSource
</Pre>
</LI>
@@ -108,14 +95,14 @@
</LI>
<LI>
-Change directory to <TT>Jazz++</TT> under your home directory and create a
-directory called <TT>Build</TT> that is in parallel with the <TT>jazz</TT>
+Change directory to <TT>OutsideSource</TT> under your home directory and create
+a directory called <TT>JazzBuild</TT> that is in parallel with the <TT>jazz</TT>
source tree directory, and change directory to that location.
<PRE>
cd ..
-mkdir Build
-cd Build
+mkdir JazzBuild
+cd JazzBuild
</PRE>
</LI>
@@ -125,23 +112,20 @@
<PRE>
../jazz/configure \
- --prefix=$HOME/Jazz++/TestInstall \
+ --prefix=/usr/local/Jazz++ \
--enable-debug \
--enable-alsa \
--enable-sequencer2
</PRE>
The <TT>prefix</TT> option is used so that the <TT>make install</TT> step
-found later in these instructions, will not require root privileges. It is
-also useful to run <TT>make install</TT> with this prefix option, so that the
-resulting install will create a copy of the <TT>jazz.cfg</TT> file that is
-independent of the one distributed in the source tree. The configuration file
-is modified by the Jazz++ binary. If the version of the <TT>jazz.cfg</TT> file
-in your svn working directory was altered, this could lead to update conflicts
-when updating the code using Subversion. This may lead to problems using
-Jazz++ as a result.
-<BR>
-<BR>
+found later in these instructions, will create a separate Jazz++ directory for
+the installation. <TT>make install</TT> will create a copy of the
+<TT>jazz.cfg</TT> file that is independent of the one distributed in the source
+tree. The configuration file is modified by the Jazz++ binary. If the version
+of the <TT>jazz.cfg</TT> file in your svn working directory was altered, this
+could lead to update conflicts when updating the code using Subversion. This
+may lead to problems using Jazz++ as a result.
</LI>
<LI>
@@ -157,16 +141,18 @@
If all goes well with the build, install Jazz++ using the following command.
<PRE>
+su
make install
+exit
</PRE>
</LI>
</OL>
<P>
You should now have a <TT>jazz</TT> binary in
-<TT>$HOME/Jazz++/TestInstall/bin</TT>. If the code prompts you for a Jazz++
+<TT>/usr/local/Jazz++/bin</TT>. If the code prompts you for a Jazz++
configuration file, select the <TT>jazz.cfg</TT> file found in
-<TT>$HOME/Jazz++/TestInstall/share/Jazz++</TT>.
+<TT>/usr/local/Jazz++/share/Jazz++</TT>.
</P>
<H3>Building Jazz++ for Mac OS X 10.5.2</H3>
@@ -215,8 +201,6 @@
modified by the Jazz++ binary. If the version in your svn working directory
was altered, this could lead to update conflicts when updating the code. This
may lead to problems using Jazz++.
-<BR>
-<BR>
</LI>
<LI>
Modified: web/htdocs/buildingtex2rtf/index.php
===================================================================
--- web/htdocs/buildingtex2rtf/index.php 2008-11-16 00:30:22 UTC (rev 632)
+++ web/htdocs/buildingtex2rtf/index.php 2008-11-16 00:39:06 UTC (rev 633)
@@ -25,28 +25,14 @@
</P>
<H3>Building Tex2RTF for Linux</H3>
-<P>
-I'm going to assume you do not have root privileges on your Linux box. Given
-this assumption, we'll create a directory called <TT>Jazz++</TT> under your
-home directory. This directory will hold the source tree for tex2rtf and
-Jazz++ that will be obtained using Subversion, a build directory call
-<TT>Tex2rtfBuild</TT> and a test installation directory called
-<TT>TestInstall</TT> that will be generated by the build sequence. The need
-for the source directory is obvious. Separating the build directory from the
-source tree will allow you to remove the build output without damaging the
-source tree. The installation directory will be created during the build
-process, and its location will remove the need for root privileges on your
-Linux box.
-</P>
<OL>
<LI>
-Create a <TT> Jazz++</TT> directory under your home directory and change
-directory to the newly created directory.
+Change directory to the <TT>OutsideSource</TT> directory you created when
+building wxWidgets.
<PRE>
cd
-mkdir Jazz++
-cd Jazz++
+cd OutsideSource
</Pre>
</LI>
@@ -70,9 +56,10 @@
</LI>
<LI>
-Change directory to <TT>Jazz++</TT> under your home directory and create a
-directory called <TT>Tex2rtfBuild</TT> that is in parallel with the
-<TT>tex2rtf</TT> source tree directory, and change directory to that location.
+Change directory to the <TT>OutsideSource</TT> directory under your home
+directory and create a directory called <TT>Tex2rtfBuild</TT>. This directory
+should be in parallel with the <TT>tex2rtf</TT> source tree directory. Change
+directory to that location.
<PRE>
cd ..
@@ -82,19 +69,12 @@
</LI>
<LI>
-Run the <TT>configure</TT> command generated by the <TT>autoreconf<TT>
-command with the following options.
+Run the <TT>configure</TT> script generated by the <TT>autoreconf</TT>
+command.
<PRE>
-../tex2rtf/configure \
- --prefix=$HOME/Jazz++/TestInstall \
- --enable-debug
+../tex2rtf/configure
</PRE>
-
-The <TT>prefix</TT> option is used so that the <TT>make install</TT> step
-found later in these instructions, will not require root privileges.
-<BR>
-<BR>
</LI>
<LI>
@@ -110,14 +90,16 @@
If all goes well with the build, install tex2rtf using the following command.
<PRE>
+su
make install
+exit
</PRE>
</LI>
</OL>
<P>
You should now have a <TT>tex2rtf</TT> binary in
-<TT>$HOME/Jazz++/TestInstall/bin</TT>.
+<TT>/usr/local/bin</TT>.
</P>
<?php
Modified: web/htdocs/buildingwx/index.php
===================================================================
--- web/htdocs/buildingwx/index.php 2008-11-16 00:30:22 UTC (rev 632)
+++ web/htdocs/buildingwx/index.php 2008-11-16 00:39:06 UTC (rev 633)
@@ -23,7 +23,7 @@
version of wxWidgets was compiled for Windows, Linux, and the Mac. The Windows
build was generated using Visual Studio. Either Visual Studio .NET 2005 or
Visual Studio .NET 2008 can be used on Windows. The Linux install was tested
-using Fedora 8 using GCC 4.1.2 and Mandriva 2008.0 using GCC 4.2.2. The Mac
+using Fedora 9 using GCC 4.3.0 and Mandriva 2008.0 using GCC 4.2.2. The Mac
build was tested using Mac OS X 10.5.2 and GCC 4.0.1.
</P>
@@ -202,12 +202,13 @@
</PRE>
</LI>
-<LI> Create a directory called <TT>WxBuild</TT> in parallel with the
-<TT>wxWidgets-2.8</TT> directory and change directory to that location.
+<LI> Create two directories called <TT>WxBuildRelease</TT> and
+<TT>WxBuildDebug</TT> in parallel with the <TT>wxWidgets-2.8</TT> directory and
+change directory to the <TT>WxBuildDebug</TT> directory.
<PRE>
-mkdir WxBuild
-cd WxBuild
+mkdir WxBuildRelease WxBuildDebug
+cd WxBuildDebug
</PRE>
</LI>
@@ -232,7 +233,7 @@
The <TT>prefix</TT> option is used so that the resulting wxWidgets build
will be installed in a non-standard location to prevent conflicts with OS
-installed versions.
+installed versions and to make it easy to remove the installation.
</LI>
<LI> Run <TT>make</TT> using the following command. This will write a file
@@ -248,13 +249,48 @@
<PRE>
su
make install
+exit
</PRE>
</LI>
+<LI>Now repeat with in the <TT>WxBuildRelease</TT> directory with the following
+configure options and install the release version as root.
+
+<PRE>
+cd ../WxBuildRelease
+../wxWidgets-2.8/configure \
+ --prefix=/usr/local/wx289 \
+ --disable-no_exceptions \
+ --disable-no_rtti \
+ --disable-compat26 \
+ --disable-unicode \
+ --with-regex=builtin \
+ --enable-std_iostreams \
+ --enable-std_string \
+ --enable-stl \
+ --with-gtk
+make 2>&1 | tee BuildLog
+su
+make install
+exit
+</PRE>
+</LI>
+
<LI>
+Install the release version of the wxWidgets build last to insure this version
+is the default configuration. If you installed the debug version last, simply
+re-install the release version. You can run the following command to determine
+the default configuration.
+
+<PRE>
+wx-config --list
+</PRE>
+</LI>
+
+<LI>
Make sure your <TT>PATH</TT> and <TT>LD_LIBRARY_PATH</TT> environment
variables are set to find the non-stock wxWidgets binaries and libraries just
-created before building Jazz++. Adding the following lines in
+created before building Tex2RTF and Jazz++. Adding the following lines in
<TT>.bash_profile</TT> will do the trick.
<PRE>
@@ -264,9 +300,7 @@
After adding the above lines to your <TT>.bash_profile</TT>
file, it is necessary to reload your bash environment to make these changes
-available. Use the following command to accomplish this;
-<BR>
-<BR>
+available. Use the following command to accomplish this.
<PRE>
source .bash_profile
@@ -356,9 +390,7 @@
After adding the above lines to your <TT>.bash_profile</TT>
file, it is necessary to reload your bash environment to make these changes
-available. Use the following command to accomplish this;
-<BR>
-<BR>
+available. Use the following command to accomplish this.
<PRE>
source .bash_profile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-16 00:30:27
|
Revision: 632
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=632&view=rev
Author: pstieber
Date: 2008-11-16 00:30:22 +0000 (Sun, 16 Nov 2008)
Log Message:
-----------
Changed the vendor and application name to match the one in configure.ac.
Modified Paths:
--------------
trunk/jazz/src/JazzPlusPlusApplication.cpp
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-15 23:52:28 UTC (rev 631)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-16 00:30:22 UTC (rev 632)
@@ -134,8 +134,8 @@
::wxInitAllImageHandlers();
- SetVendorName("Jazz");
- SetAppName("Jazz");
+ SetVendorName("Jazz++");
+ SetAppName("Jazz++");
InsureConfigurationFileExistence();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-15 23:52:37
|
Revision: 631
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=631&view=rev
Author: pstieber
Date: 2008-11-15 23:52:28 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
Converted a couple of C-style buffers to wxStrings.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2008-11-15 23:51:07 UTC (rev 630)
+++ trunk/jazz/src/Audio.cpp 2008-11-15 23:52:28 UTC (rev 631)
@@ -307,9 +307,12 @@
}
if (!wxFileExists(fname))
{
- char buf[500];
- sprintf(buf, "File not found: \"%s\"", fname);
- wxMessageBox(buf, "Error", wxOK);
+ wxString String;
+ String
+ << "File not found: \""
+ << fname
+ << '"';
+ ::wxMessageBox(String, "Error", wxOK);
continue;
}
assert(0 <= key && key < MAXSMPL);
@@ -320,9 +323,12 @@
samples[key]->SetPitch(pitch);
if (samples[key]->Load())
{
- char buf[500];
- sprintf(buf, "could not load \"%s\"", samples[key]->GetFilename());
- wxMessageBox(buf, "Error", wxOK);
+ wxString String;
+ String
+ << "Could not load: \""
+ << samples[key]->GetFilename()
+ << '"';
+ ::wxMessageBox(String, "Error", wxOK);
}
if (samplewin[key])
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-15 23:51:10
|
Revision: 630
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=630&view=rev
Author: pstieber
Date: 2008-11-15 23:51:07 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
Changed the way the Jazz++ configuration file is found.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
trunk/jazz/src/Project.h
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2008-11-15 23:18:35 UTC (rev 629)
+++ trunk/jazz/src/Project.cpp 2008-11-15 23:51:07 UTC (rev 630)
@@ -21,6 +21,8 @@
//*****************************************************************************
#include "WxWidgets.h"
+
+#include <wx/stdpaths.h>
#include <wx/config.h>
#include <wx/filename.h>
#include <wx/file.h>
@@ -363,63 +365,48 @@
//-----------------------------------------------------------------------------
void JZProject::ReadConfiguration()
{
- wxConfigBase* pConfig = wxConfigBase::Get();
+ wxString ConfigDir = wxStandardPaths::Get().GetUserDataDir();
- // Get the current working directory and append a directory separator.
- wxString CurrentWorkingDirectory =
- ::wxGetCwd() + wxFileName::GetPathSeparator();
+ wxString JazzCfgFile =
+ ConfigDir +
+ wxFileName::GetPathSeparator() +
+ mConfFileName;
- // Jazz++ should be distributed with a conf subdirectory under the
- // executable directory. This will be our initial guess for the location of
- // the Jazz++ configuration file.
- wxString ConfFileDirectoryGuess =
- CurrentWorkingDirectory + "conf" + wxFileName::GetPathSeparator();
-
- // Attempt to obtain the path to the Jazz++ configuration file from the
- // wxWidgets Jazz++ configuration file.
- wxString ConfFilePath;
- bool WasConfPathRead = false;
- if (pConfig)
- {
- WasConfPathRead = pConfig->Read(
- "/Paths/Conf",
- &ConfFilePath,
- ConfFileDirectoryGuess);
- }
-
- // Construct a full Jazz++ configuration path and file name.
- wxString ConfFileNameAndPath = ConfFilePath + mConfFileName;
-
// Test for the existence of the Jazz++ configuration file.
- if (!::wxFileExists(ConfFileNameAndPath))
+ bool ConfigurationFileFound = false;
+ if (!::wxFileExists(JazzCfgFile))
{
// Return a valid path to the data.
- FindAndRegisterConfFilePath(ConfFilePath);
- ConfFileNameAndPath = ConfFilePath + mConfFileName;
-
- // Try one more time.
- if (!::wxFileExists(ConfFileNameAndPath))
+ wxString ConfFilePath;
+ if (FindAndRegisterConfFilePath(ConfFilePath))
{
- ConfFileNameAndPath.clear();
+ JazzCfgFile = ConfFilePath + mConfFileName;
+
+ // Try one more time.
+ if (!::wxFileExists(JazzCfgFile))
+ {
+ JazzCfgFile.clear();
+ }
+ else
+ {
+ ConfigurationFileFound = true;
+ }
}
}
+ else
+ {
+ ConfigurationFileFound = true;
+ }
- if (!ConfFileNameAndPath.IsEmpty())
+ if (ConfigurationFileFound)
{
cout
- << "JZProject::ReadConfiguration() ConfFileNameAndPath:" << '\n'
- << " \"" << ConfFileNameAndPath << '"'
+ << "JZProject::ReadConfiguration() JazzCfgFile:" << '\n'
+ << " \"" << JazzCfgFile << '"'
<< endl;
- mpConfig->LoadConfig(ConfFileNameAndPath);
+ mpConfig->LoadConfig(JazzCfgFile);
}
- else
- {
- wxMessageBox(
- "Could not find configuration file.",
- "Warning",
- wxOK);
- }
}
//-----------------------------------------------------------------------------
@@ -429,25 +416,28 @@
// configuration entry so the code will find the configuration file path the
// next time it starts.
//
-// Returns:
+// Outputs:
// wxString&:
// A user selected path to the Jazz++ configuration file.
+//
+// Returns:
+// bool:
+// True if the configuration file path was set; false otherwise.
//-----------------------------------------------------------------------------
-void JZProject::FindAndRegisterConfFilePath(wxString& ConfFilePath)
+bool JZProject::FindAndRegisterConfFilePath(wxString& ConfFilePath) const
{
wxString DialogTitle;
DialogTitle = "Please Indicate the Location of " + mConfFileName;
// Use an open dialog to find the Jazz++ configuration file.
- // wxFD_CHANGE_DIR - Change the current working directory to the directory
- // where the file(s) chosen by the user are.
wxFileDialog OpenDialog(
0,
DialogTitle,
"",
mConfFileName,
"*.cfg",
- wxFD_OPEN | wxFD_CHANGE_DIR);
+ wxFD_OPEN);
+
if (OpenDialog.ShowModal() == wxID_OK)
{
// Generate a c-style string that contains a path to the help file.
@@ -463,7 +453,11 @@
// Return the user selected help file path.
ConfFilePath = TempConfFilePath;
+
+ return true;
}
+
+ return false;
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Project.h
===================================================================
--- trunk/jazz/src/Project.h 2008-11-15 23:18:35 UTC (rev 629)
+++ trunk/jazz/src/Project.h 2008-11-15 23:51:07 UTC (rev 630)
@@ -165,7 +165,7 @@
void ReadConfiguration();
- void FindAndRegisterConfFilePath(wxString& ConfFilePath);
+ bool FindAndRegisterConfFilePath(wxString& ConfFilePath) const;
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-15 23:18:38
|
Revision: 629
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=629&view=rev
Author: pstieber
Date: 2008-11-15 23:18:35 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
Changed JZConfiguration::GetFileName() to look for the Jazz++ configuration file under
the user data directory for Jazz++.
Modified Paths:
--------------
trunk/jazz/src/Configuration.cpp
trunk/jazz/src/Configuration.h
Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp 2008-11-15 23:16:27 UTC (rev 628)
+++ trunk/jazz/src/Configuration.cpp 2008-11-15 23:18:35 UTC (rev 629)
@@ -22,6 +22,7 @@
#include "WxWidgets.h"
+#include <wx/stdpaths.h>
#include <wx/filename.h>
#include "Configuration.h"
@@ -115,7 +116,6 @@
}
}
-
//*****************************************************************************
// Description:
// This is the configuration class definition.
@@ -440,9 +440,7 @@
//-----------------------------------------------------------------------------
// Description:
-// Return the Jazz++ configuration file name, normally jazz.cfg. If the
-// value has not been set by an earlier call to LoadConfig, attempt to find
-// the file using FindFile().
+// Return the Jazz++ configuration file name, normally jazz.cfg.
//-----------------------------------------------------------------------------
wxString JZConfiguration::GetFileName()
{
@@ -451,11 +449,16 @@
return mFileName;
}
- mFileName = FindFile("jazz.cfg");
+ wxString ConfigDir = wxStandardPaths::Get().GetUserDataDir();
- if (mFileName.empty())
+ wxString JazzCfgFile =
+ ConfigDir +
+ wxFileName::GetPathSeparator() +
+ "jazz.cfg";
+
+ if (::wxFileExists(JazzCfgFile))
{
- mFileName = FindFile(".jazz");
+ mFileName = JazzCfgFile;
}
return mFileName;
@@ -607,25 +610,28 @@
}
// Create a temporary file name from the current file name.
+// wxFileName TempFileName = wxFileName::CreateTempFileName(wxEmptyString);
+
string TempFileName(FileName);
TempFileName.append(".tmp");
ofstream Os(TempFileName.c_str());
+// ofstream Os(TempFileName.GetFullPath());
if (!Os)
{
return false;
}
FILE* inp = fopen(FileName.c_str(), "r");
- const string& name = GetName(Index);
+ const string& ValueName = GetName(Index);
- int len = name.length();
+ int len = ValueName.length();
char buf[1000];
bool found = false;
while (fgets(buf, sizeof(buf), inp) != NULL)
{
- if (strncmp(buf, name.c_str(), len) == 0)
+ if (strncmp(buf, ValueName.c_str(), len) == 0)
{
- Os << name << ' ' << ValueString << endl;
+ Os << ValueName << ' ' << ValueString << endl;
found = true;
}
else
@@ -635,13 +641,14 @@
}
if (!found)
{
- Os << name << ' ' << ValueString << endl;
+ Os << ValueName << ' ' << ValueString << endl;
}
fclose(inp);
Os.close();
- unlink(FileName.c_str());
- rename(TempFileName.c_str(), FileName.c_str());
+ ::wxRemoveFile(FileName.c_str());
+ ::wxRenameFile(TempFileName, FileName);
+
return true;
}
Modified: trunk/jazz/src/Configuration.h
===================================================================
--- trunk/jazz/src/Configuration.h 2008-11-15 23:16:27 UTC (rev 628)
+++ trunk/jazz/src/Configuration.h 2008-11-15 23:18:35 UTC (rev 629)
@@ -254,9 +254,7 @@
private:
// Description:
- // Return the Jazz++ configuration file name, normally jazz.cfg. If the
- // value has not been set by an earlier call to LoadConfig, attempt to
- // find the file using FindFile().
+ // Return the Jazz++ configuration file name, normally jazz.cfg.
wxString GetFileName();
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-15 23:16:30
|
Revision: 628
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=628&view=rev
Author: pstieber
Date: 2008-11-15 23:16:27 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
1. Changed FindAndRegisterHelpFilePath from void to bool so the code code determine if the
user gave up and not prompt a third time for the help file.
2. Forced the wxWidgets configuration file to be of type wxFileConfig because there seems
to be a conflict between wxStandardPaths::GetUserDataDir and wxConfig under Linux. The
latter creates a normal file as "$HOME/.AppName", while the former expects the ".AppName"
portion to be a directory. This change also removes configuration settings from the
registry on windows.
Modified Paths:
--------------
trunk/jazz/src/JazzPlusPlusApplication.cpp
trunk/jazz/src/JazzPlusPlusApplication.h
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-15 19:47:25 UTC (rev 627)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-15 23:16:27 UTC (rev 628)
@@ -23,6 +23,7 @@
#include "WxWidgets.h"
#include <wx/stdpaths.h>
+#include <wx/fileconf.h>
#include "JazzPlusPlusApplication.h"
#include "TrackFrame.h"
@@ -182,26 +183,35 @@
wxString HelpFileNameAndPath = HelpFilePath + mHelpFileName;
// Test for the existence of the help file.
- bool HelpFileFound = true;
+ bool HelpFileFound = false;
ifstream Is;
Is.open(HelpFileNameAndPath.c_str());
if (!Is)
{
- // Return a valid path to the data.
- FindAndRegisterHelpFilePath(HelpFilePath);
- HelpFileNameAndPath = HelpFilePath + mHelpFileName;
+ // Ask the user to find the help file.
+ if (FindAndRegisterHelpFilePath(HelpFilePath))
+ {
+ HelpFileNameAndPath = HelpFilePath + mHelpFileName;
- // Try one more time.
- Is.close();
- Is.clear();
- Is.open(HelpFileNameAndPath.c_str());
- if (!Is)
- {
- wxString Message = "Failed to add the IPVT book " + mHelpFileName;
- ::wxMessageBox(Message);
- HelpFileFound = false;
+ // Try one more time.
+ Is.close();
+ Is.clear();
+ Is.open(HelpFileNameAndPath.c_str());
+ if (!Is)
+ {
+ wxString Message = "Failed to add the IPVT book " + mHelpFileName;
+ ::wxMessageBox(Message);
+ }
+ else
+ {
+ HelpFileFound = true;
+ }
}
}
+ else
+ {
+ HelpFileFound = true;
+ }
if (HelpFileFound)
{
@@ -233,6 +243,36 @@
//-----------------------------------------------------------------------------
void JZJazzPlusPlusApplication::InsureConfigurationFileExistence() const
{
+ // Determine the expected location of the user's data dir for Jazz++.
+ wxString UserConfigDir = wxStandardPaths::Get().GetUserDataDir();
+
+ // Determine if the directory exists.
+ if (!wxDirExists(UserConfigDir))
+ {
+ // Attempt to create the directory.
+ if (!wxMkdir(UserConfigDir))
+ {
+ wxString String;
+ String
+ << "Unable to create directory \""
+ << UserConfigDir << '"';
+ ::wxMessageBox(String, "Directory Creation Error");
+ }
+ }
+
+ // Setup the wxWidgets configuration file.
+ wxFileName WxConfigurationFileName(UserConfigDir, ".jazz");
+
+ wxFileConfig* pFileConfig = new wxFileConfig(
+ GetAppName(),
+ wxEmptyString,
+ WxConfigurationFileName.GetFullPath(),
+ wxEmptyString,
+ wxCONFIG_USE_LOCAL_FILE);
+
+ delete wxConfigBase::Set(pFileConfig);
+
+ // Make sure all of the configuration files are setup.
vector<wxString> ConfigurationFileNames;
ConfigurationFileNames.push_back("README");
ConfigurationFileNames.push_back("jazz.cfg");
@@ -256,20 +296,6 @@
ConfigurationFileNames.push_back("xgdrmset.jzi");
ConfigurationFileNames.push_back("xgvoices.jzi");
- wxString UserConfigDir = wxStandardPaths::Get().GetUserDataDir();
-
- if (!wxDirExists(UserConfigDir))
- {
- if (!wxMkdir(UserConfigDir))
- {
- wxString String;
- String
- << "Unable to create directory \""
- << UserConfigDir << '"';
- ::wxMessageBox(String, "Directory Creation Error");
- }
- }
-
for (
vector<wxString>::const_iterator iConfigurationFileName =
ConfigurationFileNames.begin();
@@ -306,8 +332,8 @@
// found, create a configuration entry so the code can find the help file path
// the next time it starts.
//-----------------------------------------------------------------------------
-void JZJazzPlusPlusApplication::FindAndRegisterHelpFilePath(
- wxString& HelpFilePath)
+bool JZJazzPlusPlusApplication::FindAndRegisterHelpFilePath(
+ wxString& HelpFilePath) const
{
wxString Message;
Message = "Unable to find " + mHelpFileName;
@@ -317,10 +343,11 @@
wxFileDialog OpenDialog(
0,
"Open the Help File",
- "",
+ HelpFilePath,
mHelpFileName,
"*.hhp",
wxFD_OPEN);
+
if (OpenDialog.ShowModal() == wxID_OK)
{
// Generate a c-style string that contains a path to the help file.
@@ -336,7 +363,11 @@
// Return the user selected help file path.
HelpFilePath = TempHelpFilePath;
+
+ return true;
}
+
+ return false;
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/JazzPlusPlusApplication.h
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.h 2008-11-15 19:47:25 UTC (rev 627)
+++ trunk/jazz/src/JazzPlusPlusApplication.h 2008-11-15 23:16:27 UTC (rev 628)
@@ -92,7 +92,7 @@
void InsureConfigurationFileExistence() const;
- void FindAndRegisterHelpFilePath(wxString& HelpFilePath);
+ bool FindAndRegisterHelpFilePath(wxString& HelpFilePath) const;
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-15 19:47:28
|
Revision: 627
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=627&view=rev
Author: pstieber
Date: 2008-11-15 19:47:25 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
Added code to copy the configuration files from the shared location to the uses
Jazz++ configuration directory.
Modified Paths:
--------------
trunk/jazz/src/JazzPlusPlusApplication.cpp
trunk/jazz/src/JazzPlusPlusApplication.h
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-15 15:49:27 UTC (rev 626)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-15 19:47:25 UTC (rev 627)
@@ -51,6 +51,7 @@
#endif
#include <fstream>
+#include <vector>
using namespace std;
@@ -135,18 +136,7 @@
SetVendorName("Jazz");
SetAppName("Jazz");
- wxString ConfigDir = wxStandardPaths::Get().GetUserDataDir();
- if (!wxDirExists(ConfigDir))
- {
- if (!wxMkdir(ConfigDir))
- {
- wxString String;
- String
- << "Unable to create directory \""
- << ConfigDir << '"';
- ::wxMessageBox(String, "Directory Creation Error");
- }
- }
+ InsureConfigurationFileExistence();
// Create the one and only top-level Jazz++ project.
mpProject = new JZProject;
@@ -237,6 +227,81 @@
//-----------------------------------------------------------------------------
// Description:
+// This function checks to see if the user's Jazz++ configuration directory
+// files exist and creates the directory and copies default versions if they
+// do not.
+//-----------------------------------------------------------------------------
+void JZJazzPlusPlusApplication::InsureConfigurationFileExistence() const
+{
+ vector<wxString> ConfigurationFileNames;
+ ConfigurationFileNames.push_back("README");
+ ConfigurationFileNames.push_back("jazz.cfg");
+ ConfigurationFileNames.push_back("jazz.mid");
+ ConfigurationFileNames.push_back("ctrlnam.jzi");
+ ConfigurationFileNames.push_back("e26voice.jzi");
+ ConfigurationFileNames.push_back("e26.jzi");
+ ConfigurationFileNames.push_back("gm.jzi");
+ ConfigurationFileNames.push_back("gmdrmnam.jzi");
+ ConfigurationFileNames.push_back("gmdrmset.jzi");
+ ConfigurationFileNames.push_back("gmvoices.jzi");
+ ConfigurationFileNames.push_back("gs.jzi");
+ ConfigurationFileNames.push_back("gsdrmset.jzi");
+ ConfigurationFileNames.push_back("gsvoices.jzi");
+ ConfigurationFileNames.push_back("jv1000.jzi");
+ ConfigurationFileNames.push_back("sc88pdrm.jzi");
+ ConfigurationFileNames.push_back("sc88pro.jzi");
+ ConfigurationFileNames.push_back("sc88pvoi.jzi");
+ ConfigurationFileNames.push_back("xg.jzi");
+ ConfigurationFileNames.push_back("xgdrmnam.jzi");
+ ConfigurationFileNames.push_back("xgdrmset.jzi");
+ ConfigurationFileNames.push_back("xgvoices.jzi");
+
+ wxString UserConfigDir = wxStandardPaths::Get().GetUserDataDir();
+
+ if (!wxDirExists(UserConfigDir))
+ {
+ if (!wxMkdir(UserConfigDir))
+ {
+ wxString String;
+ String
+ << "Unable to create directory \""
+ << UserConfigDir << '"';
+ ::wxMessageBox(String, "Directory Creation Error");
+ }
+ }
+
+ for (
+ vector<wxString>::const_iterator iConfigurationFileName =
+ ConfigurationFileNames.begin();
+ iConfigurationFileName != ConfigurationFileNames.end();
+ ++iConfigurationFileName)
+ {
+ // Check to see if the user already has a jazz.cfg file in the
+ // user configuration directory.
+ wxString JazzCfgFile =
+ UserConfigDir +
+ wxFileName::GetPathSeparator() +
+ *iConfigurationFileName;
+
+ if (!::wxFileExists(JazzCfgFile))
+ {
+ // Attempt to copy the default Jazz++ configuration file to this
+ // directory.
+ wxString DefaultJazzCfgFile =
+ wxStandardPaths::Get().GetDataDir() +
+ wxFileName::GetPathSeparator() +
+ *iConfigurationFileName;
+
+ if (::wxFileExists(DefaultJazzCfgFile))
+ {
+ ::wxCopyFile(DefaultJazzCfgFile, JazzCfgFile);
+ }
+ }
+ }
+}
+
+//-----------------------------------------------------------------------------
+// Description:
// The help file was not found so let the user search for it. If it is
// found, create a configuration entry so the code can find the help file path
// the next time it starts.
Modified: trunk/jazz/src/JazzPlusPlusApplication.h
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.h 2008-11-15 15:49:27 UTC (rev 626)
+++ trunk/jazz/src/JazzPlusPlusApplication.h 2008-11-15 19:47:25 UTC (rev 627)
@@ -90,6 +90,8 @@
private:
+ void InsureConfigurationFileExistence() const;
+
void FindAndRegisterHelpFilePath(wxString& HelpFilePath);
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-15 15:49:29
|
Revision: 626
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=626&view=rev
Author: pstieber
Date: 2008-11-15 15:49:27 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
1. Added AC_CANONICAL_SYSTEM.
2. Removed language save and restore.
3. Updated ALSA, sequencer2, and mpu401 checks, and fixed a bug in the
sequencer 2 check that caused the profile option to be turned on when the
sequencer was enabled.
4. Updated the wxWidgets checking scheme. Jazz++ will use a debug version of
wxWidgets if Jazz++ is built in debug mode. You must build and install a
debug a debug version of wxWidgets for this to work.
5. Fixed some debug logic bu defining an empty TLDEBUG.
6. Set the default release build optimization to O3.
Modified Paths:
--------------
trunk/jazz/configure.ac
Modified: trunk/jazz/configure.ac
===================================================================
--- trunk/jazz/configure.ac 2008-11-15 14:44:25 UTC (rev 625)
+++ trunk/jazz/configure.ac 2008-11-15 15:49:27 UTC (rev 626)
@@ -6,6 +6,9 @@
AC_CONFIG_SRCDIR([src/JazzPlusPlusApplication.cpp])
+dnl sets build, host, target variables and the same with _alias
+AC_CANONICAL_SYSTEM
+
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(src/config.h)
@@ -26,9 +29,6 @@
CFLAGS=${CFLAGS:=}
AC_PROG_CC
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
dnl C++-compiler checks
dnl defines CXX with the compiler to use
dnl defines GXX with yes if using gxx
@@ -39,8 +39,6 @@
CXXFLAGS=${CXXFLAGS:=}
AC_PROG_CXX
-AC_LANG_RESTORE
-
AC_PROG_LIBTOOL
dnl Make autoconf use C++ for its tests.
@@ -126,11 +124,12 @@
dnl ---------------------------------------
dnl check if we are to enable alsa support
dnl ---------------------------------------
- AC_ARG_ENABLE(alsa, --enable-alsa Support ALSA)
+ AC_MSG_CHECKING([whether to enable ALSA])
+ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], [enable ALSA support]))
+ AC_MSG_RESULT(${enable_alsa-no})
if test x$enable_alsa = xyes ; then
- AC_MSG_RESULT(alsa is enabled)
- AC_DEFINE(DEV_ALSA,1,[use alsa drivers])
+ AC_DEFINE(DEV_ALSA, 1, [use alsa drivers])
fi
fi
@@ -142,46 +141,47 @@
sequencer2,
AC_HELP_STRING(
[--enable-sequencer2],
- [enable sequencer2 support (off by default)]),
- ac_arg_profile="$enableval",
- ac_arg_profile="no")
+ [enable sequencer2 support (off by default)]))
AC_MSG_RESULT(${enable_sequencer2-no})
if test x$enable_sequencer2 = xyes ; then
- AC_MSG_RESULT(sequencer2 is enabled)
AC_DEFINE(DEV_SEQUENCER2, 1, [support /dev/sequencer2])
fi
dnl ----------------------------------------
dnl check if we are to enable mpu401 support
dnl ----------------------------------------
-AC_ARG_ENABLE(mpu401, --enable-mpu401 Support jazz mpu401 driver)
+AC_MSG_CHECKING([whether to enable Jazz++ mpu401 driver])
+AC_ARG_ENABLE(
+ mpu401,
+ AC_HELP_STRING([--enable-mpu401], [enable support jazz mpu401 driver]))
+AC_MSG_RESULT(${enable_mpu401-no})
if test x$enable_mpu401 = xyes ; then
AC_MSG_RESULT(Mpu401 is enabled)
- AC_DEFINE(DEV_MPU401,1,[support jazz's own driver over tcp/ip])
+ AC_DEFINE(DEV_MPU401, 1, [support jazz's own driver over tcp/ip])
fi
-wx_config_args="--static=no"
-if test x$ac_arg_debug = xyes ; then
- wx_config_args="$wx_config_args --debug"
-fi
-
dnl Check for wxWidgets
AM_OPTIONS_WXCONFIG
+MIN_WX_VERSION="2.8.9"
+AM_PATH_WXCONFIG(
+ $MIN_WX_VERSION,
+ [WX_FOUND=1],
+ [WXFOUND=0],
+ [std],
+ [--debug=$ac_arg_debug])
-AM_PATH_WXCONFIG(2.8.9, wxWin=1)
-
-if test "$wxWin" != 1; then
+if test "$WX_FOUND" != 1; then
AC_MSG_ERROR([
wxWidgets must be installed on your system, but the
wx-config script couldn't be found.
-
+
Please check that wx-config is in your PATH, the
directory where wxWidgets libraries are installed
(returned by 'wx-config --libs' command) is in
LD_LIBRARY_PATH or equivalent variable, and the
- wxWidgets version is 2.8.9 or above.
+ wxWidgets version is $MIN_VERSION or above.
])
fi
@@ -191,6 +191,7 @@
PORTMIDI_PATH=$JAZZ_PATH/portmidi
AC_SUBST(PORTMIDI_PATH)
+TLDEBUG=
if test x$ac_arg_debug = xyes ; then
TLDEBUG="-g -fno-inline"
else
@@ -200,7 +201,7 @@
PROFILE=
if test x$ac_arg_profile = xyes ; then
dnl The debug flag must be on for profiling to work.
- if test x$ac_arg_debug = xyes ; then
+ if test x$TLDEBUG = x ; then
TLDEBUG="-g -fno-inline"
fi
PROFILE="-pg"
@@ -209,7 +210,7 @@
OPTIMISE=-O0
if test x$ac_arg_optimize = xyes ; then
if test x$opt_level = x; then
- OPTIMISE="-O2"
+ OPTIMISE="-O3"
elif test x$opt_level = x0 ; then
OPTIMISE="-O1"
elif test x$opt_level = x1 ; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-15 14:44:30
|
Revision: 625
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=625&view=rev
Author: pstieber
Date: 2008-11-15 14:44:25 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
Updated the wxWidgets m4 code.
Modified Paths:
--------------
trunk/jazz/config/acinclude.m4
Modified: trunk/jazz/config/acinclude.m4
===================================================================
--- trunk/jazz/config/acinclude.m4 2008-11-15 14:36:19 UTC (rev 624)
+++ trunk/jazz/config/acinclude.m4 2008-11-15 14:44:25 UTC (rev 625)
@@ -5,56 +5,102 @@
dnl ---------------------------------------------------------------------------
dnl Macros for wxWidgets detection. Typically used in configure.in as:
dnl
-dnl AC_ARG_ENABLE(...)
-dnl AC_ARG_WITH(...)
-dnl ...
-dnl AM_OPTIONS_WXCONFIG
-dnl ...
-dnl ...
-dnl AM_PATH_WXCONFIG(2.8.7, wxWin=1)
-dnl if test "$wxWin" != 1; then
-dnl AC_MSG_ERROR([
-dnl wxWidgets must be installed on your system, but
-dnl the wx-config script couldn't be found.
+dnl AC_ARG_ENABLE(...)
+dnl AC_ARG_WITH(...)
+dnl ...
+dnl AM_OPTIONS_WXCONFIG
+dnl ...
+dnl ...
+dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1)
+dnl if test "$wxWin" != 1; then
+dnl AC_MSG_ERROR([
+dnl wxWidgets must be installed on your system
+dnl but wx-config script couldn't be found.
dnl
-dnl Please check that wx-config is in path, the directory
-dnl where wxWidgets libraries are installed (returned by
-dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl equivalent variable and wxWidgets version is 2.8.7 or above.
-dnl ])
-dnl fi
-dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl Please check that wx-config is in path, the directory
+dnl where wxWidgets libraries are installed (returned by
+dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl equivalent variable and wxWidgets version is 2.3.4 or above.
+dnl ])
+dnl fi
+dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
dnl
-dnl LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl LIBS="$LIBS $WX_LIBS"
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
dnl AM_OPTIONS_WXCONFIG
dnl
-dnl adds support for --wx-prefix, --wx-exec-prefix and --wx-config
-dnl command line options
+dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
+dnl --wx-config command line options
dnl ---------------------------------------------------------------------------
AC_DEFUN([AM_OPTIONS_WXCONFIG],
[
- AC_ARG_WITH(wx-prefix, [ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
- wx_config_prefix="$withval", wx_config_prefix="")
- AC_ARG_WITH(wx-exec-prefix,[ --with-wx-exec-prefix=PREFIX Exec prefix where wxWidgets is installed (optional)],
- wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
- AC_ARG_WITH(wx-config,[ --with-wx-config=CONFIG wx-config script to use (optional)],
- wx_config_name="$withval", wx_config_name="")
+ AC_ARG_WITH(wxdir,
+ [ --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH],
+ [ wx_config_name="$withval/wx-config"
+ wx_config_args="--inplace"])
+ AC_ARG_WITH(wx-config,
+ [ --with-wx-config=CONFIG wx-config script to use (optional)],
+ wx_config_name="$withval" )
+ AC_ARG_WITH(wx-prefix,
+ [ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
+ wx_config_prefix="$withval", wx_config_prefix="")
+ AC_ARG_WITH(wx-exec-prefix,
+ [ --with-wx-exec-prefix=PREFIX
+ Exec prefix where wxWidgets is installed (optional)],
+ wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
])
+dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
+dnl wx_ver_ok=yes if it is:
+AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
+[
+ wx_ver_ok=""
+ if test "x$WX_VERSION" != x ; then
+ if test $wx_config_major_version -gt $1; then
+ wx_ver_ok=yes
+ else
+ if test $wx_config_major_version -eq $1; then
+ if test $wx_config_minor_version -gt $2; then
+ wx_ver_ok=yes
+ else
+ if test $wx_config_minor_version -eq $2; then
+ if test $wx_config_micro_version -ge $3; then
+ wx_ver_ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+])
+
dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
+dnl [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
dnl
dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
dnl environment variable to override the default name of the wx-config script
dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
dnl case the macro won't even waste time on tests for its existence.
+dnl
+dnl Optional WX-LIBS argument contains comma- or space-separated list of
+dnl wxWidgets libraries to link against (it may include contrib libraries). If
+dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
+dnl link with all of the core wxWidgets libraries.
+dnl
+dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
+dnl invocation command in present. It can be used to fine-tune lookup of
+dnl best wxWidgets build available.
+dnl
+dnl Example use:
+dnl AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
+dnl [--unicode --debug])
dnl ---------------------------------------------------------------------------
dnl
@@ -66,6 +112,7 @@
if test x${WX_CONFIG_NAME+set} != xset ; then
WX_CONFIG_NAME=wx-config
fi
+
if test "x$wx_config_name" != x ; then
WX_CONFIG_NAME="$wx_config_name"
fi
@@ -79,6 +126,9 @@
wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
fi
+ if test "$cross_compiling" = "yes"; then
+ wx_config_args="$wx_config_args --host=$host_alias"
+ fi
dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
if test -x "$WX_CONFIG_NAME" ; then
@@ -86,20 +136,22 @@
WX_CONFIG_PATH="$WX_CONFIG_NAME"
AC_MSG_RESULT($WX_CONFIG_PATH)
else
-dnl AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
- AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no)
+ AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
fi
if test "$WX_CONFIG_PATH" != "no" ; then
WX_VERSION=""
- no_wx=""
min_wx_version=ifelse([$1], ,2.2.1,$1)
- AC_MSG_CHECKING(for wxWidgets version >= $min_wx_version)
+ if test -z "$5" ; then
+ AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
+ else
+ AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
+ fi
- WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args"
+ WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
- WX_VERSION=`$WX_CONFIG_WITH_ARGS --version`
+ WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
wx_config_major_version=`echo $WX_VERSION | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
wx_config_minor_version=`echo $WX_VERSION | \
@@ -114,31 +166,27 @@
wx_requested_micro_version=`echo $min_wx_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- wx_ver_ok=""
- if test $wx_config_major_version -gt $wx_requested_major_version; then
- wx_ver_ok=yes
- else
- if test $wx_config_major_version -eq $wx_requested_major_version; then
- if test $wx_config_minor_version -gt $wx_requested_minor_version; then
- wx_ver_ok=yes
- else
- if test $wx_config_minor_version -eq $wx_requested_minor_version; then
- if test $wx_config_micro_version -ge $wx_requested_micro_version; then
- wx_ver_ok=yes
- fi
- fi
- fi
- fi
- fi
+ _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+ [$wx_requested_minor_version],
+ [$wx_requested_micro_version])
- if test "x$wx_ver_ok" = x ; then
- no_wx=yes
- else
+ if test -n "$wx_ver_ok"; then
+
+ AC_MSG_RESULT(yes (version $WX_VERSION))
WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
- WX_GL_LIBS=`$WX_CONFIG_WITH_ARGS --gl-libs`
- WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs`
- WX_GL_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --gl-libs`
+ dnl is this even still appropriate? --static is a real option now
+ dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
+ dnl what the user actually wants, making this redundant at best.
+ dnl For now keep it in case anyone actually used it in the past.
+ AC_MSG_CHECKING([for wxWidgets static library])
+ WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
+ if test "x$WX_LIBS_STATIC" = "x"; then
+ AC_MSG_RESULT(no)
+ else
+ AC_MSG_RESULT(yes)
+ fi
+
dnl starting with version 2.2.6 wx-config has --cppflags argument
wx_has_cppflags=""
if test $wx_config_major_version -gt 2; then
@@ -157,6 +205,24 @@
fi
fi
+ dnl starting with version 2.7.0 wx-config has --rescomp option
+ wx_has_rescomp=""
+ if test $wx_config_major_version -gt 2; then
+ wx_has_rescomp=yes
+ else
+ if test $wx_config_major_version -eq 2; then
+ if test $wx_config_minor_version -ge 7; then
+ wx_has_rescomp=yes
+ fi
+ fi
+ fi
+ if test "x$wx_has_rescomp" = x ; then
+ dnl cannot give any useful info for resource compiler
+ WX_RESCOMP=
+ else
+ WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
+ fi
+
if test "x$wx_has_cppflags" = x ; then
dnl no choice but to define all flags like CFLAGS
WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
@@ -174,57 +240,131 @@
WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
fi
- fi
- if test "x$no_wx" = x ; then
- AC_MSG_RESULT(yes (version $WX_VERSION))
- ifelse([$2], , :, [$2])
+ ifelse([$2], , :, [$2])
+
else
+
if test "x$WX_VERSION" = x; then
- dnl no wx-config at all
- AC_MSG_RESULT(no)
+ dnl no wx-config at all
+ AC_MSG_RESULT(no)
else
- AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
+ AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
fi
WX_CFLAGS=""
WX_CPPFLAGS=""
WX_CXXFLAGS=""
WX_LIBS=""
- WX_GL_LIBS=""
WX_LIBS_STATIC=""
- WX_GL_LIBS_STATIC=""
+ WX_RESCOMP=""
ifelse([$3], , :, [$3])
+
fi
+ else
+
+ WX_CFLAGS=""
+ WX_CPPFLAGS=""
+ WX_CXXFLAGS=""
+ WX_LIBS=""
+ WX_LIBS_STATIC=""
+ WX_RESCOMP=""
+
+ ifelse([$3], , :, [$3])
+
fi
- dnl Setup resource compiler option for cygwin.
- WX_WRCFLAGS=""
- for opt in $WX_CXXFLAGS
- do
- case "$opt" in
- -I*)
- WX_WRCFLAGS="$WX_WRCFLAGS --include-dir \"`echo "$opt" | sed 's/^-I//'`\""
- ;;
- -D*)
- WX_WRCFLAGS="$WX_WRCFLAGS --define \"`echo "$opt" | sed 's/^-D//'`\""
- ;;
- *)
- ;;
- esac
- done
- dnl To debug resource setting use the following line
- dnl echo "WX_WRCFLAGS=$WX_WRCFLAGS"
-
- AC_SUBST(WX_WRCFLAGS)
AC_SUBST(WX_CPPFLAGS)
AC_SUBST(WX_CFLAGS)
AC_SUBST(WX_CXXFLAGS)
AC_SUBST(WX_CFLAGS_ONLY)
AC_SUBST(WX_CXXFLAGS_ONLY)
AC_SUBST(WX_LIBS)
- AC_SUBST(WX_GL_LIBS)
AC_SUBST(WX_LIBS_STATIC)
- AC_SUBST(WX_GL_LIBS_STATIC)
AC_SUBST(WX_VERSION)
+ AC_SUBST(WX_RESCOMP)
])
+
+dnl ---------------------------------------------------------------------------
+dnl Get information on the wxrc program for making C++, Python and xrs
+dnl resource files.
+dnl
+dnl AC_ARG_ENABLE(...)
+dnl AC_ARG_WITH(...)
+dnl ...
+dnl AM_OPTIONS_WXCONFIG
+dnl ...
+dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1)
+dnl if test "$wxWin" != 1; then
+dnl AC_MSG_ERROR([
+dnl wxWidgets must be installed on your system
+dnl but wx-config script couldn't be found.
+dnl
+dnl Please check that wx-config is in path, the directory
+dnl where wxWidgets libraries are installed (returned by
+dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl equivalent variable and wxWidgets version is 2.6.0 or above.
+dnl ])
+dnl fi
+dnl
+dnl AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0])
+dnl if test "x$HAVE_WXRC" != x1; then
+dnl AC_MSG_ERROR([
+dnl The wxrc program was not installed or not found.
+dnl
+dnl Please check the wxWidgets installation.
+dnl ])
+dnl fi
+dnl
+dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl
+dnl LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl ---------------------------------------------------------------------------
+
+
+
+dnl ---------------------------------------------------------------------------
+dnl AM_PATH_WXRC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
+dnl resources. The variable WXRC will be set and substituted in the configure
+dnl script and Makefiles.
+dnl
+dnl Example use:
+dnl AM_PATH_WXRC([wxrc=1], [wxrc=0])
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl wxrc program from the wx-config script
+dnl
+AC_DEFUN([AM_PATH_WXRC],
+[
+ AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
+
+ if test "x$WX_CONFIG_NAME" = x; then
+ AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
+ else
+
+ AC_MSG_CHECKING([for wxrc])
+
+ if test "x$WXRC" = x ; then
+ dnl wx-config --utility is a new addition to wxWidgets:
+ _WX_PRIVATE_CHECK_VERSION(2,5,3)
+ if test -n "$wx_ver_ok"; then
+ WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
+ fi
+ fi
+
+ if test "x$WXRC" = x ; then
+ AC_MSG_RESULT([not found])
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT([$WXRC])
+ ifelse([$1], , :, [$1])
+ fi
+
+ AC_SUBST(WXRC)
+ fi
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-15 14:36:24
|
Revision: 624
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=624&view=rev
Author: pstieber
Date: 2008-11-15 14:36:19 +0000 (Sat, 15 Nov 2008)
Log Message:
-----------
Used wxWidgets standard paths to set the location of the help cache directory in
a place writable by the user. This is the first step in allowing a Linux install
under /usr/local or some other system directory.
Modified Paths:
--------------
trunk/jazz/src/JazzPlusPlusApplication.cpp
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-11 22:30:53 UTC (rev 623)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-11-15 14:36:19 UTC (rev 624)
@@ -22,6 +22,8 @@
#include "WxWidgets.h"
+#include <wx/stdpaths.h>
+
#include "JazzPlusPlusApplication.h"
#include "TrackFrame.h"
#include "Project.h"
@@ -133,6 +135,19 @@
SetVendorName("Jazz");
SetAppName("Jazz");
+ wxString ConfigDir = wxStandardPaths::Get().GetUserDataDir();
+ if (!wxDirExists(ConfigDir))
+ {
+ if (!wxMkdir(ConfigDir))
+ {
+ wxString String;
+ String
+ << "Unable to create directory \""
+ << ConfigDir << '"';
+ ::wxMessageBox(String, "Directory Creation Error");
+ }
+ }
+
// Create the one and only top-level Jazz++ project.
mpProject = new JZProject;
gpProject = mpProject;
@@ -200,8 +215,12 @@
if (HelpFileFound)
{
+ // GetUserDataDir returns the directory for the user-dependent application
+ // data files. The value is $HOME/.appname on Linux,
+ // c:\Documents and Settings\username\Application Data\appname on
+ // Windows, and ~/Library/Application Support/appname on the Mac.
// The cached version of the help file will be placed in this location.
- mHelp.SetTempDir(HelpFilePath);
+ mHelp.SetTempDir(wxStandardPaths::Get().GetUserDataDir());
// Add the IPVT help file the the help system.
mHelp.AddBook(HelpFileNameAndPath);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-11 22:31:02
|
Revision: 623
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=623&view=rev
Author: pstieber
Date: 2008-11-11 22:30:53 +0000 (Tue, 11 Nov 2008)
Log Message:
-----------
Updated to version 2.8.9 of wxWidgets.
Modified Paths:
--------------
branches/jazz-4.1.9/vc8/JazzPlusPlus/Jazz-VC8.vcproj
trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Modified: branches/jazz-4.1.9/vc8/JazzPlusPlus/Jazz-VC8.vcproj
===================================================================
--- branches/jazz-4.1.9/vc8/JazzPlusPlus/Jazz-VC8.vcproj 2008-11-11 17:42:42 UTC (rev 622)
+++ branches/jazz-4.1.9/vc8/JazzPlusPlus/Jazz-VC8.vcproj 2008-11-11 22:30:53 UTC (rev 623)
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../src;../../mswin;"$(EXT_PKGS)\wxMSW-2.8.8-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.8-VC8\include""
+ AdditionalIncludeDirectories="../../src;../../mswin;"$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include""
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -81,7 +81,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
IgnoreDefaultLibraryNames="libcd.lib,libcid.lib,msvcrt.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -147,7 +147,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../src;../../mswin;"$(EXT_PKGS)\wxMSW-2.8.8-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.8-VC8\include""
+ AdditionalIncludeDirectories="../../src;../../mswin;"$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include""
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -182,7 +182,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
IgnoreDefaultLibraryNames="libc.lib,libci.lib,msvcrtd.lib"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
===================================================================
--- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-11-11 17:42:42 UTC (rev 622)
+++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2008-11-11 22:30:53 UTC (rev 623)
@@ -46,7 +46,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.8-VC8\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -69,7 +69,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.8-VC8\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC8\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -80,7 +80,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -146,7 +146,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.8-VC8\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC8\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -170,7 +170,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.8-VC8\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC8\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -181,7 +181,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC8\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC8\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-11-11 17:42:42 UTC (rev 622)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2008-11-11 22:30:53 UTC (rev 623)
@@ -48,7 +48,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.8-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -71,7 +71,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.8-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -82,7 +82,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -147,7 +147,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.8-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.9-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -171,7 +171,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.8-VC9\include"
+ AdditionalIncludeDirectories="$(EXT_PKGS)\wxMSW-2.8.9-VC9\include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -182,7 +182,7 @@
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.8-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.9-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
@@ -838,7 +838,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing Custom Help Build Step"
- CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.8-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.8-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html;$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx"
/>
</FileConfiguration>
@@ -847,7 +847,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.8-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.8-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
+ CommandLine="echo cd "$(InputDir)"
cd "$(InputDir)"
echo $(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
$(EXT_PKGS)\wxMSW-2.8.9-VC9\bin\tex2rtf "$(InputName).tex" "$(InputName).html" -html -twice
"
Outputs="$(InputDir)$(InputName)_contents.html"
/>
</FileConfiguration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-11 17:42:51
|
Revision: 622
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=622&view=rev
Author: pstieber
Date: 2008-11-11 17:42:42 +0000 (Tue, 11 Nov 2008)
Log Message:
-----------
Made a cosmetic change.
Modified Paths:
--------------
tex2rtf/configure.ac
Modified: tex2rtf/configure.ac
===================================================================
--- tex2rtf/configure.ac 2008-11-09 04:07:46 UTC (rev 621)
+++ tex2rtf/configure.ac 2008-11-11 17:42:42 UTC (rev 622)
@@ -101,7 +101,7 @@
AC_MSG_ERROR(unknown system type ${host}.)
esac
- wx_config_args="--static=no"
+wx_config_args="--static=no"
if test x$ac_arg_debug = xyes ; then
wx_config_args="$wx_config_args --debug"
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-09 04:07:50
|
Revision: 621
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=621&view=rev
Author: pstieber
Date: 2008-11-09 04:07:46 +0000 (Sun, 09 Nov 2008)
Log Message:
-----------
Added the Tex2RTF build instruction page.
Modified Paths:
--------------
web/htdocs/include/leftnav.php
Modified: web/htdocs/include/leftnav.php
===================================================================
--- web/htdocs/include/leftnav.php 2008-11-09 04:07:00 UTC (rev 620)
+++ web/htdocs/include/leftnav.php 2008-11-09 04:07:46 UTC (rev 621)
@@ -9,6 +9,7 @@
<p><a href="/buildingwx/">Building wxWidgets</a></p>
<p><a href="/subversion/">Subversion</a></p>
<p><a href="/tex2rtf/">Tex2RTF</a></p>
+<p><a href="/buildingtex2rtf/">Building Tex2RTF</a></p>
<p><a href="/buildingjazz/">Building Jazz++</a></p>
<p><a href="/bugreports/">Reporting Bugs</a></p>
<p><a href="/credits/">Credits</a></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-09 04:07:02
|
Revision: 620
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=620&view=rev
Author: pstieber
Date: 2008-11-09 04:07:00 +0000 (Sun, 09 Nov 2008)
Log Message:
-----------
Updated the build instructions. May not be 100% correct, but close.
Modified Paths:
--------------
web/htdocs/buildingtex2rtf/index.php
Modified: web/htdocs/buildingtex2rtf/index.php
===================================================================
--- web/htdocs/buildingtex2rtf/index.php 2008-11-09 03:49:46 UTC (rev 619)
+++ web/htdocs/buildingtex2rtf/index.php 2008-11-09 04:07:00 UTC (rev 620)
@@ -16,7 +16,7 @@
<TD class="mainCopy">
<H2>Building Tex2RTF</H2>
<P>
-Tex2RTFuses a non-stock build of the
+Tex2RTF uses a non-stock build of the
<A NAME="wxWidgetsLink" HREF="http://www.wxwidgets.org">wxWidgets</A> library.
See
<A NAME="wxWidgetsLink" HREF="/buildingwx">the wxWidgets build instructions</A>
@@ -28,14 +28,15 @@
<P>
I'm going to assume you do not have root privileges on your Linux box. Given
this assumption, we'll create a directory called <TT>Jazz++</TT> under your
-home directory. This directory will hold the source tree that will be obtained
-using Subversion, a build directory call <TT>Build</TT> and a test installation
-directory called <TT>TestInstall</TT> that will be generated by the build
-sequence. The need for the source directory is obvious. Separating the build
-directory from the source tree will allow you to remove the build output
-without damaging the source tree. The installation directory will be created
-during the build process, and its location will remove the need for root
-privileges on your Linux box.
+home directory. This directory will hold the source tree for tex2rtf and
+Jazz++ that will be obtained using Subversion, a build directory call
+<TT>Tex2rtfBuild</TT> and a test installation directory called
+<TT>TestInstall</TT> that will be generated by the build sequence. The need
+for the source directory is obvious. Separating the build directory from the
+source tree will allow you to remove the build output without damaging the
+source tree. The installation directory will be created during the build
+process, and its location will remove the need for root privileges on your
+Linux box.
</P>
<OL>
@@ -50,7 +51,7 @@
</LI>
<LI>
-Checkout the HEAD version of Jazz++ using the following command.
+Checkout the Tex2RTF source code using the following command.
You must have a Subversion client loaded on your machine.
<PRE>
@@ -70,13 +71,13 @@
<LI>
Change directory to <TT>Jazz++</TT> under your home directory and create a
-directory called <TT>Build</TT> that is in parallel with the <TT>jazz</TT>
-source tree directory, and change directory to that location.
+directory called <TT>Tex2rtfBuild</TT> that is in parallel with the
+<TT>tex2rtf</TT> source tree directory, and change directory to that location.
<PRE>
cd ..
mkdir Tex2rtfBuild
-cd Build
+cd Tex2rtfBuild
</PRE>
</LI>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2008-11-09 03:49:49
|
Revision: 619
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=619&view=rev
Author: pstieber
Date: 2008-11-09 03:49:46 +0000 (Sun, 09 Nov 2008)
Log Message:
-----------
Started the process of adding tex2rtf build instructions.
Added Paths:
-----------
web/htdocs/buildingtex2rtf/
web/htdocs/buildingtex2rtf/index.php
Added: web/htdocs/buildingtex2rtf/index.php
===================================================================
--- web/htdocs/buildingtex2rtf/index.php (rev 0)
+++ web/htdocs/buildingtex2rtf/index.php 2008-11-09 03:49:46 UTC (rev 619)
@@ -0,0 +1,129 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<HTML xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
+<HEAD>
+<LINK rel="stylesheet" href="/include/jazz.css" type="text/css" />
+<TITLE>Building Tex2RTF</TITLE>
+</HEAD>
+<BODY>
+<H1 class="title">Jazz++ MIDI Sequencer</H1>
+<TABLE class="main">
+<TR>
+<TD class="leftNav">
+<?php
+require_once('../include/leftnav.php');
+?>
+</TD>
+<TD class="mainCopy">
+<H2>Building Tex2RTF</H2>
+<P>
+Tex2RTFuses a non-stock build of the
+<A NAME="wxWidgetsLink" HREF="http://www.wxwidgets.org">wxWidgets</A> library.
+See
+<A NAME="wxWidgetsLink" HREF="/buildingwx">the wxWidgets build instructions</A>
+to create and install the non-stock wxWidgets build. This non-stock wxWidgets
+build must be available before using the instructions on this page.
+</P>
+
+<H3>Building Tex2RTF for Linux</H3>
+<P>
+I'm going to assume you do not have root privileges on your Linux box. Given
+this assumption, we'll create a directory called <TT>Jazz++</TT> under your
+home directory. This directory will hold the source tree that will be obtained
+using Subversion, a build directory call <TT>Build</TT> and a test installation
+directory called <TT>TestInstall</TT> that will be generated by the build
+sequence. The need for the source directory is obvious. Separating the build
+directory from the source tree will allow you to remove the build output
+without damaging the source tree. The installation directory will be created
+during the build process, and its location will remove the need for root
+privileges on your Linux box.
+</P>
+
+<OL>
+<LI>
+Create a <TT> Jazz++</TT> directory under your home directory and change
+directory to the newly created directory.
+<PRE>
+cd
+mkdir Jazz++
+cd Jazz++
+</Pre>
+</LI>
+
+<LI>
+Checkout the HEAD version of Jazz++ using the following command.
+You must have a Subversion client loaded on your machine.
+
+<PRE>
+svn checkout https://jazzplusplus.svn.sourceforge.net/svnroot/jazzplusplus/tex2rtf tex2rtf
+</PRE>
+</LI>
+
+<LI>
+Change directory to the created <TT>tex2rtf</TT> directory and run the
+<TT>autoreconf</TT> command.
+
+<PRE>
+cd tex2rtf
+autoreconf --verbose
+</PRE>
+</LI>
+
+<LI>
+Change directory to <TT>Jazz++</TT> under your home directory and create a
+directory called <TT>Build</TT> that is in parallel with the <TT>jazz</TT>
+source tree directory, and change directory to that location.
+
+<PRE>
+cd ..
+mkdir Tex2rtfBuild
+cd Build
+</PRE>
+</LI>
+
+<LI>
+Run the <TT>configure</TT> command generated by the <TT>autoreconf<TT>
+command with the following options.
+
+<PRE>
+../tex2rtf/configure \
+ --prefix=$HOME/Jazz++/TestInstall \
+ --enable-debug
+</PRE>
+
+The <TT>prefix</TT> option is used so that the <TT>make install</TT> step
+found later in these instructions, will not require root privileges.
+<BR>
+<BR>
+</LI>
+
+<LI>
+Run <TT>make</TT> using the following command. This will write a file
+called <TT>BuildLog</TT> that may be useful if you run into trouble.
+
+<PRE>
+make 2>&1 | tee BuildLog
+</PRE>
+</LI>
+
+<LI>
+If all goes well with the build, install tex2rtf using the following command.
+
+<PRE>
+make install
+</PRE>
+</LI>
+</OL>
+
+<P>
+You should now have a <TT>tex2rtf</TT> binary in
+<TT>$HOME/Jazz++/TestInstall/bin</TT>.
+</P>
+
+<?php
+require_once('../include/footer.php');
+?>
+</TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
Property changes on: web/htdocs/buildingtex2rtf/index.php
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
