You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Tim Kemp <su...@kempy.co.uk> on 2003/04/16 07:02:53 UTC
RE: svn commit: rev 5638 - in trunk: . subversion/bindings/com subversion/clients/cmdline subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_ra subversion/libsvn_ra_dav subversion/libsvn_ra_local
And how do you expect us Win32 peeps to build now, I suspect that you
have forgotten to check the dsw in :o)
And I suppose that I need python now too,
Any thing else????
Tim
> -----Original Message-----
> From: gstein@tigris.org [mailto:gstein@tigris.org]
> Sent: 15 April 2003 23:20
> To: svn@subversion.tigris.org
> Subject: svn commit: rev 5638 - in trunk: .
> subversion/bindings/com subversion/clients/cmdline
> subversion/libsvn_client subversion/libsvn_delta
> subversion/libsvn_diff subversion/libsvn_fs
> subversion/libsvn_ra subversion/libsvn_ra_dav
> subversion/libsvn_ra_local sub
>
>
> Author: gstein
> Date: Tue Apr 15 17:19:40 2003
> New Revision: 5638
>
> Removed:
> trunk/subversion.dsp
> trunk/subversion.dsw
> trunk/subversion/bindings/com/svn_com.dsp
> trunk/subversion/clients/cmdline/subversion_client.dsp
> trunk/subversion/libsvn_client/libsvn_client.dsp
> trunk/subversion/libsvn_delta/libsvn_delta.dsp
> trunk/subversion/libsvn_diff/libsvn_diff.dsp
> trunk/subversion/libsvn_fs/libsvn_fs.dsp
> trunk/subversion/libsvn_ra/libsvn_ra.dsp
> trunk/subversion/libsvn_ra_dav/libsvn_ra_dav.dsp
> trunk/subversion/libsvn_ra_local/libsvn_ra_local.dsp
> trunk/subversion/libsvn_ra_svn/libsvn_ra_svn.dsp
> trunk/subversion/libsvn_repos/libsvn_repos.dsp
> trunk/subversion/libsvn_subr/libsvn_subr.dsp
> trunk/subversion/libsvn_wc/libsvn_wc.dsp
> trunk/subversion/mod_dav_svn/mod_dav_svn.dsp
> trunk/subversion/svnadmin/svnadmin.dsp
> trunk/subversion/svnlook/svnlook.dsp
> trunk/subversion/svnserve/svnserve.dsp
> trunk/subversion/svnversion/svnversion.dsp
> trunk/subversion/tests/libsvn_delta/random_test.dsp
> trunk/subversion/tests/libsvn_delta/svndiff_test.dsp
> trunk/subversion/tests/libsvn_delta/vdelta_test.dsp
> trunk/subversion/tests/libsvn_diff/diff3_test.dsp
> trunk/subversion/tests/libsvn_diff/diff4_test.dsp
> trunk/subversion/tests/libsvn_diff/diff_diff3_test.dsp
> trunk/subversion/tests/libsvn_diff/diff_test.dsp
> trunk/subversion/tests/libsvn_fs/changes_test.dsp
> trunk/subversion/tests/libsvn_fs/fs_test.dsp
> trunk/subversion/tests/libsvn_fs/key_test.dsp
> trunk/subversion/tests/libsvn_fs/skel_test.dsp
> trunk/subversion/tests/libsvn_fs/strings_reps_test.dsp
> trunk/subversion/tests/libsvn_repos/repos_test.dsp
> trunk/subversion/tests/libsvn_subr/config_test.dsp
> trunk/subversion/tests/libsvn_subr/hashdump_test.dsp
> trunk/subversion/tests/libsvn_subr/path_test.dsp
> trunk/subversion/tests/libsvn_subr/stream_test.dsp
> trunk/subversion/tests/libsvn_subr/string_test.dsp
> trunk/subversion/tests/libsvn_subr/target_test.dsp
> trunk/subversion/tests/libsvn_subr/time_test.dsp
> trunk/subversion/tests/libsvn_test_main.dsp
> trunk/subversion/tests/libsvn_wc/translate_test.dsp
> trunk/svn_check.dsp
> Modified:
> trunk/INSTALL
> trunk/autogen.sh
> Log:
> Feedback from the list indicates that the auto-generated .dsp
> files seem to work okay. There still needs to be a bit of
> polish around Windows builds using the generated .dsp files,
> but this puts us nearly there. Indications are that
> mod_dav_svn doesn't build with the currently-generated .dsp file.
>
> * INSTALL: add a comment about the (new) installation/build changes
>
> * autogen.sh:
> - rename the VERSION_CHECK var to RELEASE_MODE (since that is what
> it is really about)
> - add SKIP_DEPS for processing the -s switch (functionality which
> got lost a ways back)
> - add additional gen-make steps for the dsp files to replace the
> ones which we blew away. for now, this only runs during the
> release process when we are guaranteed to have apr(-util) as a
> subdirectory
> - tweak the gen-make error detection logic a bit since we now run it
> a couple times
>
> * everywhere/*.dsp: removed
>
> * subversion.dsw: removed
>
>
> Modified: trunk/INSTALL
> ==============================================================
> ================
> --- trunk/INSTALL (original)
> +++ trunk/INSTALL Tue Apr 15 17:19:40 2003
> @@ -649,6 +649,13 @@
> and all the import libraries to <SVN>\db4-win32\lib. Again, the
> DLLs should be somewhere in your path.
>
> + *** THESE BUILD INSTRUCTIONS ARE A BIT OUT OF DATE.
> + ***
> + *** instead, see subversion_msvc.dsw in the root directory,
> + *** and svn_config.dsp. the former references the individual
> + *** .dsp files for building Subversion. svn_config.dsp is a
> + *** small project to get some files prepared before building.
> +
> The workspace `subversion.dsw' at the top of the source tree
> includes all the necessary projects. Right now, only static
> libraries are built. The "__build__" project (active
> by default)
>
> Modified: trunk/autogen.sh
> ==============================================================
> ================
> --- trunk/autogen.sh (original)
> +++ trunk/autogen.sh Tue Apr 15 17:19:40 2003
> @@ -4,18 +4,23 @@
>
>
> # Run tests to ensure that our build requirements are met
> -VERSION_CHECK=""
> +RELEASE_MODE=""
> NEON_CHECK_CONTROL=""
> +SKIP_DEPS=""
> while test $# != 0; do
> case "$1" in
> --release)
> - VERSION_CHECK="$1"
> + RELEASE_MODE="$1"
> shift
> ;;
> --disable-neon-version-check)
> NEON_CHECK_CONTROL="$1"
> shift
> ;;
> + -s)
> + SKIP_DEPS="yes"
> + shift
> + ;;
> --) # end of option parsing
> break
> ;;
> @@ -29,7 +34,7 @@
> # ### we don't want to copy the fancy option parsing loop
> there. For the # ### same reason, all parameters should be
> quoted, so that buildcheck.sh # ### sees an empty arg rather
> than missing one. -./build/buildcheck.sh "$VERSION_CHECK"
> "$NEON_CHECK_CONTROL" || exit 1
> +./build/buildcheck.sh "$RELEASE_MODE" "$NEON_CHECK_CONTROL" || exit 1
>
> ### temporary cleanup during transition to libtool 1.4
> (cd ac-helpers ; rm -f ltconfig ltmain.sh libtool.m4)
> @@ -94,16 +99,30 @@
> exit 1
> fi
>
> -if test "$1" = "-s"; then
> +if test -n "$SKIP_DEPS"; then
> echo "Creating build-outputs.mk (no dependencies)..."
> - ./gen-make.py -s build.conf ;
> + ./gen-make.py -s build.conf || gen_failed=1
> +
> + ### if apr and apr-util are not subdirs, then this fails.
> only do it
> + ### for the release (from dist.sh; for now) if test -n
> + "$RELEASE_MODE"; then
> + echo "Creating MSVC files (no dependencies)..."
> + ./gen-make.py -t dsp -s build.conf || gen_failed=1
> + fi
> else
> echo "Creating build-outputs.mk..."
> - ./gen-make.py build.conf ;
> + ./gen-make.py build.conf || gen_failed=1
> +
> + ### if apr and apr-util are not subdirs, then this fails.
> only do it
> + ### for the release (from dist.sh; for now) if test -n
> + "$RELEASE_MODE"; then
> + echo "Creating MSVC files..."
> + ./gen-make.py -t dsp -s build.conf || gen_failed=1
> + fi
> fi
>
> -if test "$?" != "0"; then
> - echo "gen-make.py failed"
> +if test -n "$gen_failed"; then
> + echo "ERROR: gen-make.py failed"
> exit 1
> fi
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 5638 - in trunk: . subversion/bindings/com subversion/clients/cmdline subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_ra subversion/libsvn_ra_dav subversion/libsvn_ra_local
Posted by Greg Stein <gs...@lyra.org>.
On Wed, Apr 16, 2003 at 01:30:32PM -0500, Ben Collins-Sussman wrote:
> Greg Stein <gs...@lyra.org> writes:
>
> > 2) gen-make.py -t dsp
>
> Sounds like this step needs to be added to our 'tarball release
> procedure' document, right? It will affect Michael Price's next
> release process.
It is already in there. :-)
When dist.sh runs autogen.sh, it passes the --release switch. For releases,
we always have apr(-util) subdirs, so I enabled the dsp gen-make step.
That's why I clarified the step only applies when you pull directly from
source control.
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 5638 - in trunk: . subversion/bindings/com subversion/clients/cmdline subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_ra subversion/libsvn_ra_dav subversion/libsvn_ra_local
Posted by Ben Collins-Sussman <su...@collab.net>.
Greg Stein <gs...@lyra.org> writes:
> 2) gen-make.py -t dsp
Sounds like this step needs to be added to our 'tarball release
procedure' document, right? It will affect Michael Price's next
release process.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: svn commit: rev 5638 - in trunk: . subversion/bindings/com subversion/clients/cmdline subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_ra subversion/libsvn_ra_dav subversion/libsvn_ra_local
Posted by Tim Kemp <su...@kempy.co.uk>.
> Thus, the steps to build from source control are:
>
> 1) grab source
> 2) gen-make.py -t dsp
> 3) open the .dsw
Thanks Greg, all is clear now
Tim
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 5638 - in trunk: . subversion/bindings/com subversion/clients/cmdline subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_ra subversion/libsvn_ra_dav subversion/libsvn_ra_local
Posted by Greg Stein <gs...@lyra.org>.
On Wed, Apr 16, 2003 at 08:02:53AM +0100, Tim Kemp wrote:
> And how do you expect us Win32 peeps to build now, I suspect that you
> have forgotten to check the dsw in :o)
>
> And I suppose that I need python now too,
>
> Any thing else????
The .dsw is generated along with the .dsp files.
As before, you can do one of two things:
1) pull from version control directly and use autogen.sh. this will require
Python for the gen-make steps in autogen (we've always required Python
for people who work from source control).
[ but see below ]
2) use a source tarball/ZIP. the dsp and dsw files will be present as part
of the release procedure.
Note that the system requires an "apr" and "apr-util" subdir from the trunk,
which is the same as before. Since that isn't the case for everybody who
runs autogen.sh, I could not (for now) run the DSP gen-make process
automatically from autogen.sh. (hmm; but I don't supposed you're running
autogen.sh on Windows anyways :-).
Thus, the steps to build from source control are:
1) grab source
2) gen-make.py -t dsp
3) open the .dsw
So one more step if you build from source control. The release process
handles step (2) automatically.
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org