Barry Scott wrote:
> The layout in svn-win32-0.34.0_dev.zip is more usable then the
> what a build of the svn sources ends up with. Do you have a easy
> way (make target, script) that makes the layout in
> svn-win32-0.34.0_dev.zip?
Attached, if it'll help. This is the script I use to package a binary
release.
> Its a pity that svn-win32-0.34.0_dev.zip does not add on to an
> installed subversion on c:\prorgam files\subversion.
Of course it does. It has the same layout, and (except for README.txt)
does not contain any files that are in any of the other zip files.
> What I'm thinking about is how to document building pysvn
> Extension. Given a build of subversion from source and the
> dev kit have incompatible layouts its just one more problem
> rather then a solution. All the paths in the DSP files can
> only work with one layout.
I'm almost 99% certain that I don't know what you're talking about.
> Oh and turning the dev into a INNO kit would be cool then it
> could add on to the base subversion install.
This has been discussed, and will happen once it reaches the top of
Jostein's TODO list.
--
Brane Čibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
#!/bin/sh
if [ "$1" = "" ]; then
echo "What's the name of the distro?"
exit 1
fi
DST=$1
if [ "$2" = "" ]; then
BIN=./repo
else
BIN=$2
fi
REL=Release
SRC=./tools/dist-skel
ZIP=$DST.zip
PDB=${DST}_pdb.zip
DEV=${DST}_dev.zip
PY=${DST}_py.zip
BLD=$BIN/$REL/subversion
SVN_DIR=clients/cmdline
SVN_FILES='svn.exe svn.pdb'
SVNADMIN_DIR=svnadmin
SVNADMIN_FILES='svnadmin.exe svnadmin.pdb'
SVNLOOK_DIR=svnlook
SVNLOOK_FILES='svnlook.exe svnlook.pdb'
SVNDUMPFILTER_DIR=svndumpfilter
SVNDUMPFILTER_FILES='svndumpfilter.exe svndumpfilter.pdb'
SVNSERVE_DIR=svnserve
SVNSERVE_FILES='svnserve.exe svnserve.pdb'
SVNVERSION_DIR=svnversion
SVNVERSION_FILES='svnversion.exe svnversion.pdb'
MOD_DAV_SVN_DIR=mod_dav_svn
MOD_DAV_SVN_FILES='mod_dav_svn.so mod_dav_svn.pdb'
MOD_AUTHZ_SVN_DIR=mod_authz_svn
MOD_AUTHZ_SVN_FILES='mod_authz_svn.so mod_authz_svn.pdb'
NMAKE="/cygdrive/c/Software/Microsoft Visual Studio/VC98/Bin/NMAKE.EXE"
APR_ICONV_DIR=../../apr-iconv
APR_ICONV_DST=iconv
SWIG_PYTHON=$BIN/subversion/bindings/swig/python
SWIG_PYTHON_BUILD=$BLD/bindings/swig/python
DOXYGEN=doxygen
DOXY_CONF=doc/doxygen.conf
DOXY_HTML=doc/doxygen/html
# Remove the current distro dir
if [ -d $DST ]; then
rm -fr $DST || exit 1
fi
rm -f $ZIP || exit 1
rm -f $PDB || exit 1
rm -f $DEV || exit 1
rm -fr $BIN/$DOXY_HTML || exit 1
mkdir -p $DST || exit 1
mkdir -p $DST/bin || exit 1
mkdir -p $DST/doc || exit 1
mkdir -p $DST/httpd || exit 1
mkdir -p $DST/include || exit 1
mkdir -p $DST/include/apr || exit 1
mkdir -p $DST/include/apr-util || exit 1
mkdir -p $DST/lib || exit 1
mkdir -p $DST/lib/apr || exit 1
mkdir -p $DST/lib/apr-util || exit 1
mkdir -p $DST/python || exit 1
mkdir -p $DST/python/libsvn || exit 1
mkdir -p $DST/python/svn || exit 1
cp -R $SRC/* $DST || exit 1
# Copy the new files
for f in $SVN_FILES; do
echo "Copying $BLD/$SVN_DIR/$f"
echo " -> $DST/bin/$f"
cp $BLD/$SVN_DIR/$f $DST/bin/$f || exit 1
done
for f in $SVNADMIN_FILES; do
echo "Copying $BLD/$SVNADMIN_DIR/$f"
echo " -> $DST/bin/$f"
cp $BLD/$SVNADMIN_DIR/$f $DST/bin/$f || exit 1
done
for f in $SVNLOOK_FILES; do
echo "Copying $BLD/$SVNLOOK_DIR/$f"
echo " -> $DST/bin/$f"
cp $BLD/$SVNLOOK_DIR/$f $DST/bin/$f || exit 1
done
for f in $SVNDUMPFILTER_FILES; do
echo "Copying $BLD/$SVNDUMPFILTER_DIR/$f"
echo " -> $DST/bin/$f"
cp $BLD/$SVNDUMPFILTER_DIR/$f $DST/bin/$f || exit 1
done
for f in $SVNSERVE_FILES; do
echo "Copying $BLD/$SVNSERVE_DIR/$f"
echo " -> $DST/bin/$f"
cp $BLD/$SVNSERVE_DIR/$f $DST/bin/$f || exit 1
done
for f in $SVNVERSION_FILES; do
echo "Copying $BLD/$SVNVERSION_DIR/$f"
echo " -> $DST/bin/$f"
cp $BLD/$SVNVERSION_DIR/$f $DST/bin/$f || exit 1
done
for f in $MOD_DAV_SVN_FILES; do
echo "Copying $BLD/$MOD_DAV_SVN_DIR/$f"
echo " -> $DST/httpd/$f"
cp $BLD/$MOD_DAV_SVN_DIR/$f $DST/httpd/$f || exit 1
done
for f in $MOD_AUTHZ_SVN_FILES; do
echo "Copying $BLD/$MOD_AUTHZ_SVN_DIR/$f"
echo " -> $DST/httpd/$f"
cp $BLD/$MOD_AUTHZ_SVN_DIR/$f $DST/httpd/$f || exit 1
done
echo "Installing apr-iconv to $DST/$APR_ICONV_DST"
(
INSTALL_TO="`pwd`/$DST/$APR_ICONV_DST"
INSTALL_DIR=`echo $INSTALL_TO | sed -e 's@^/cygdrive/\([a-z]\)/@\1:/@' \
| sed -e 's@^/home/@C:/Home/@' \
| sed -e 's@/@\\\\@g'`
cd $BLD/$APR_ICONV_DIR/ccs
"$NMAKE" -nologo -f Makefile.win install \
INSTALL_DIR='"'"$INSTALL_DIR"'"' \
BUILD_MODE=$REL BIND_MODE=static
cd ../ces
"$NMAKE" -nologo -f Makefile.win install \
INSTALL_DIR='"'"$INSTALL_DIR"'"' \
BUILD_MODE=$REL BIND_MODE=static
)
echo "Copying Subversion include files to $DST/include"
cp -v $BIN/subversion/include/*.h $DST/include
echo "Copying Subversion libraries to $DST/lib"
for d in $BLD/libsvn_*; do
cp -v $d/*.lib $DST/lib
done
echo "Copying APR include files to $DST/include"
cp -v $BIN/apr/include/*.h $DST/include/apr
cp -v $BIN/apr-util/include/*.h $DST/include/apr-util
echo "Copying APR libraries to $DST/lib"
cp -v $BIN/apr/LibR/apr*.lib $DST/lib/apr
cp -v $BIN/apr/LibR/apr*.pdb $DST/lib/apr
cp -v $BIN/apr-util/LibR/apr*.lib $DST/lib/apr-util
cp -v $BIN/apr-util/LibR/apr*.pdb $DST/lib/apr-util
echo "Copyong Python bindings"
cp -v $SWIG_PYTHON/svn/*.py $DST/python/svn
cp -v $SWIG_PYTHON/*.py $DST/python/libsvn
cp -v $SWIG_PYTHON_BUILD/*.dll $DST/python/libsvn
cp -v $SWIG_PYTHON_BUILD/*.pdb $DST/python/libsvn
echo "Generating doxygen configuration"
(
cd $BIN
$DOXYGEN $DOXY_CONF
)
echo "Copying documentation files"
cp -v $BIN/$DOXY_HTML/* $DST/doc
# Create the ZIP archives
zip -r $ZIP $DST/README.txt $DST/bin $DST/httpd $DST/iconv -x '*.pdb'
zip -r $DEV $DST/README.txt $DST/doc $DST/include $DST/lib -x '*.pdb'
zip -r $PY $DST/README.txt $DST/python -x '*.pdb'
zip -r $PDB $DST -i '*.pdb' zip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Dec 17 08:53:25 2003