You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2012/08/16 12:18:03 UTC
svn commit: r1373783 [50/50] - in /subversion/branches/compressed-pristines:
./ build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ contrib/client-side/emacs/ contrib/client-side/svn-push/
contrib/client-side/svnmerge/ cont...
Modified: subversion/branches/compressed-pristines/tools/dev/unix-build/README
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/tools/dev/unix-build/README?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/tools/dev/unix-build/README (original)
+++ subversion/branches/compressed-pristines/tools/dev/unix-build/README Thu Aug 16 10:17:48 2012
@@ -22,12 +22,24 @@ repository.
Usage
=====
-First, choose a directory $(SVN_DEV) to set up the environment. Note
-that this directory cannot be changed later because the script
-hardcodes build and link paths relative to the current working
-directory.
+First, choose a directory $(SVN_DEV) to set up the environment.
+For example, $(SVN_DEV) could be the directory "~/svn".
+Note that this directory cannot be changed later because the script
+hardcodes build and link paths relative to the current working directory.
+
+ $ mkdir $(SVN_DEV)
+
+Now change into this directory and make the Makefile available in it:
+
+ $ cd $(SVN_DEV)
+ $ svn checkout https://svn.apache.org/repos/asf/subversion/trunk/tools/dev/unix-build
+ $ ln -s unix-build/Makefile.svn Makefile
+
+To fetch and build trunk, simply don't pass anything, just run 'make':
+
+ $ cd $(SVN_DEV)
+ $ make
-To fetch and build trunk, simply don't pass anything.
Pass the branch you want to build in BRANCH, e.g.
$ make BRANCH="1.5.x"
You can also pass a tag to build:
@@ -39,19 +51,37 @@ than one working copy of the same branch
When the script has finished fetching and building, it uses
$(SVN_DEV)/prefix to install Subversion libraries and
binaries. $(SVN_DEV)/prefix/svn-trunk (or whatever you choose to
-build) will contain the latest Subversion binaries: you should add
-$(SVN_DEV)/prefix/svn-trunk/bin to your $PATH to use them. The
-Makefile in $(SVN_DEV)/svn-trunk is configured to build with sane
+build) will contain the latest Subversion binaries. You can add
+$(SVN_DEV)/prefix/svn-trunk/bin to your $PATH to use them:
+
+ $ export PATH="$(SVN_DEV)/prefix/svn-trunk/bin:$PATH"
+
+The Makefile in $(SVN_DEV)/svn-trunk is configured to build with sane
options: while developing Subversion, simply `svn up` to pull the
latest changes, `make` and `make install` to install the binaries in
-$(SVN_DEV)/prefix/svn-trunk.
+$(SVN_DEV)/prefix/svn-trunk. This usually works fine. If not, you may
+need to use the 'svn-reset' target and recompile everything.
+
+If at any point, you want to recompile any of the packages with the
+default configuration in Makefile.svn, use the *-clean and *-reset
+target in Makefile.svn before trying to rebuild again. For example:
+
+ $ make svn-clean
+ $ make svn-reset
+ $ make
+
+Or, if you want to recompile svn and all dependencies:
+
+ $ make clean
+ $ make reset
+ $ make
+
+If you want to remove everything including the installed binaries effectively
+returning to the starting point, use the "nuke" target (BE CAREFUL, this will
+remove the 'svn' binary compiled from trunk which you might need to manage
+existing working copies):
-If at any point, you want to re-configure any of the packages to the
-default configuration in Makefile.svn, just run the "<PACKAGE>-reset"
-target in Makefile.svn before trying to rebuild again. If, in the
-extreme case, you want to remove everything including the installed
-binaries effectively returning to the starting point, use the "nuke"
-target.
+ $ make nuke
Extended usage
==============
Modified: subversion/branches/compressed-pristines/tools/dev/windows-build/Makefile
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/tools/dev/windows-build/Makefile?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/tools/dev/windows-build/Makefile (original)
+++ subversion/branches/compressed-pristines/tools/dev/windows-build/Makefile Thu Aug 16 10:17:48 2012
@@ -31,7 +31,7 @@ INSTALLDIR=E:\svn
EXPATVER=2.0.0
HTTPDVER=2.2.13
-NEONVER=0.28.2
+SERFVER=1.1.0
OPENSSLVER=0.9.8k
SQLITEVER=3.6.3
ZLIBVER=1.2.3
@@ -40,7 +40,6 @@ ZLIBVER=1.2.3
PATCHESDIR=$(HOME)\mydiffs\svn
OPENSSLDIR=$(SOURCESDIR)\openssl-$(OPENSSLVER)
EXPATDIR=$(SOURCESDIR)\expat-$(EXPATVER)
-NEONDIR=$(SOURCESDIR)\neon-$(NEONVER)
HTTPDDIR=$(SOURCESDIR)\httpd-$(HTTPDVER)
#APRDIR=$(SOURCESDIR)\apr
#APRUTILDIR=$(SOURCESDIR)\apr-util
@@ -50,7 +49,7 @@ APRUTILDIR=$(HTTPDDIR)\srclib\apr-util
APRICONVDIR=$(HTTPDDIR)\srclib\apr-iconv
SQLITEDIR=$(SOURCESDIR)\sqlite-amalgamation
ZLIBDIR=$(SOURCESDIR)\zlib-$(ZLIBVER)
-SERFDIR=$(SOURCESDIR)\serf
+SERFDIR=$(SOURCESDIR)\serf-$(SERFVER)
all:
@echo Available targets: newfiles versionstamp
@@ -101,10 +100,10 @@ targetdir: TARGETDIRset
# TODO: pass --with-apr-* if you don't have httpd; make --with-* args optional
config: targetdir
- python gen-make.py --$(CONFIG) --with-httpd=$(HTTPDDIR) --with-neon=$(NEONDIR) --with-serf=$(SERFDIR) --with-openssl=$(OPENSSLDIR) --with-sqlite=$(SQLITEDIR) --with-zlib=$(ZLIBDIR) $(ENABLE_ML) --vsnet-version=2008 -t vcproj 2>&1 | tee log.gen-make
+ python gen-make.py --$(CONFIG) --with-httpd=$(HTTPDDIR) --with-serf=$(SERFDIR) --with-openssl=$(OPENSSLDIR) --with-sqlite=$(SQLITEDIR) --with-zlib=$(ZLIBDIR) $(ENABLE_ML) --vsnet-version=2008 -t vcproj 2>&1 | tee log.gen-make
# Visual Studio 2008
-libsvn_auth_gnome_keyring libsvn_auth_kwallet libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_base libsvn_fs_fs libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_neon libsvn_ra_serf libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc: targetdir
+libsvn_auth_gnome_keyring libsvn_auth_kwallet libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_base libsvn_fs_fs libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_serf libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc: targetdir
$(MSBUILD) /t:Libraries\$@
$(MAKE) package
svn svnadmin svndumpfilter svnlook svnmucc svnserve svnsync svnversion svnrdump entries-dump: targetdir
@@ -128,7 +127,7 @@ all2: targetdir
package:
test -d $(SVNDIR)\$(CONFIG)\Subversion\tests\cmdline || mkdir $(SVNDIR)\$(CONFIG)\Subversion\tests\cmdline
test -d $(TARGETDIR)\bin || mkdir $(TARGETDIR)\bin
- for %%i in (svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion svnrdump) do @$(CP) $(CONFIG)\subversion\%%i\%%i.exe $(TARGETDIR)\bin
+ for %%i in (svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion svnrdump svnmucc) do @$(CP) $(CONFIG)\subversion\%%i\%%i.exe $(TARGETDIR)\bin
for %%i in (diff diff3 diff4) do @if exist $(CONFIG)\tools\diff\%%i.exe $(CP) $(CONFIG)\tools\diff\%%i.exe $(TARGETDIR)\bin
$(CP) $(APRDIR)\$(CONFIG)/*.dll $(TARGETDIR)\bin
$(CP) $(APRUTILDIR)\$(CONFIG)/*.dll $(TARGETDIR)\bin
Modified: subversion/branches/compressed-pristines/tools/dist/nightly.sh
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/tools/dist/nightly.sh?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/tools/dist/nightly.sh (original)
+++ subversion/branches/compressed-pristines/tools/dist/nightly.sh Thu Aug 16 10:17:48 2012
@@ -63,7 +63,7 @@ $svn export -r $head $repo/trunk/build/g
# Create the environment
cd roll
echo '----------------building environment------------------'
-../release.py --base-dir ${abscwd}/roll build-env
+../release.py --base-dir ${abscwd}/roll build-env trunk-nightly
# Roll the tarballs
echo '-------------------rolling tarball--------------------'
@@ -72,8 +72,8 @@ cd ..
# Create the information page
echo '-------------------moving results---------------------'
-./release.py --base-dir ${abscwd}/roll post-candidates trunk-nightly $head \
- --target $target
+# ./release.py --base-dir ${abscwd}/roll post-candidates trunk-nightly $head \
+# --target $target
if [ ! -d "$target/dist" ]; then mkdir "$target/dist"; fi
if [ -d "$target/dist/r$head" ]; then rm -r "$target/dist/r$head"; fi
mv roll/deploy $target/dist/r$head
Modified: subversion/branches/compressed-pristines/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/tools/dist/release.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/tools/dist/release.py (original)
+++ subversion/branches/compressed-pristines/tools/dist/release.py Thu Aug 16 10:17:48 2012
@@ -84,6 +84,7 @@ tool_versions = {
# Some constants
repos = 'http://svn.apache.org/repos/asf/subversion'
+secure_repos = 'https://svn.apache.org/repos/asf/subversion'
dist_repos = 'https://dist.apache.org/repos/dist'
dist_dev_url = dist_repos + '/dev/subversion'
dist_release_url = dist_repos + '/release/subversion'
@@ -416,14 +417,15 @@ def roll_tarballs(args):
extra_args = '-nightly'
else:
extra_args = '-%s %d' % (args.version.pre, args.version.pre_num)
- logging.info('Building UNIX tarballs')
- run_script(args.verbose, '%s/dist.sh -v %s -pr %s -r %d %s'
- % (sys.path[0], args.version.base, branch, args.revnum,
- extra_args) )
+ # Build Unix last to leave Unix-style svn_version.h for tagging
logging.info('Buildling Windows tarballs')
run_script(args.verbose, '%s/dist.sh -v %s -pr %s -r %d -zip %s'
% (sys.path[0], args.version.base, branch, args.revnum,
extra_args) )
+ logging.info('Building UNIX tarballs')
+ run_script(args.verbose, '%s/dist.sh -v %s -pr %s -r %d %s'
+ % (sys.path[0], args.version.base, branch, args.revnum,
+ extra_args) )
# Move the results to the deploy directory
logging.info('Moving artifacts and calculating checksums')
@@ -478,14 +480,47 @@ def post_candidates(args):
'Post candidate artifacts to the dist development directory.'
logging.info('Importing tarballs to %s' % dist_dev_url)
- proc = subprocess.Popen(['svn', 'import', '-m',
- 'Add %s candidate release artifacts'
- % args.version.base,
- get_deploydir(args.base_dir), dist_dev_url])
+ svn_cmd = ['svn', 'import', '-m',
+ 'Add %s candidate release artifacts' % args.version.base,
+ '--auto-props', '--config-option',
+ 'config:auto-props:*.asc=svn:eol-style=native;svn:mime-type=text/plain',
+ get_deploydir(args.base_dir), dist_dev_url]
+ if (args.username):
+ svn_cmd += ['--username', args.username]
+ proc = subprocess.Popen(svn_cmd)
(stdout, stderr) = proc.communicate()
proc.wait()
#----------------------------------------------------------------------
+# Create tag
+
+def create_tag(args):
+ 'Create tag in the repository'
+
+ logging.info('Creating tag for %s' % str(args.version))
+
+ if args.branch:
+ branch = secure_repos + '/' + args.branch
+ else:
+ branch = secure_repos + '/branches/%d.%d.x' % (args.version.major,
+ args.version.minor)
+
+ tag = secure_repos + '/tags/' + str(args.version)
+
+ svnmucc_cmd = ['svnmucc', '-m',
+ 'Tagging release ' + str(args.version)]
+ if (args.username):
+ svnmucc_cmd += ['--username', args.username]
+ svnmucc_cmd += ['cp', str(args.revnum), branch, tag]
+ svnmucc_cmd += ['put', os.path.join(get_deploydir(args.base_dir),
+ 'svn_version.h.dist'),
+ tag + '/subversion/include/svn_version.h']
+
+ # don't redirect stdout/stderr since svnmucc might ask for a password
+ proc = subprocess.Popen(svnmucc_cmd)
+ proc.wait()
+
+#----------------------------------------------------------------------
# Clean dist
def clean_dist(args):
@@ -512,6 +547,8 @@ def clean_dist(args):
svnmucc_cmd = ['svnmucc', '-m', 'Remove old Subversion releases.\n' +
'They are still available at ' +
'http://archive.apache.org/dist/subversion/']
+ if (args.username):
+ svnmucc_cmd += ['--username', args.username]
for k, g in itertools.groupby(sorted(versions),
lambda x: (x.major, x.minor)):
releases = list(g)
@@ -547,6 +584,8 @@ def move_to_dist(args):
filenames.append(entry)
svnmucc_cmd = ['svnmucc', '-m',
'Publish Subversion-%s.' % str(args.version)]
+ if (args.username):
+ svnmucc_cmd += ['--username', args.username]
svnmucc_cmd += ['rm', dist_dev_url + '/' + 'svn_version.h.dist']
for filename in filenames:
svnmucc_cmd += ['mv', dist_dev_url + '/' + filename,
@@ -676,6 +715,8 @@ def check_sigs(args):
good_sigs[verified.key_id[-8:]] = True
else:
sys.stderr.write("BAD SIGNATURE for %s\n" % filename)
+ if verified.key_id:
+ sys.stderr.write(" key id: %s\n" % verified.key_id)
sys.exit(1)
for id in good_sigs.keys():
@@ -758,6 +799,21 @@ def main():
subparser.set_defaults(func=post_candidates)
subparser.add_argument('version', type=Version,
help='''The release label, such as '1.7.0-alpha1'.''')
+ subparser.add_argument('--username',
+ help='''Username for ''' + dist_repos + '''.''')
+
+ # Setup the parser for the create-tag subcommand
+ subparser = subparsers.add_parser('create-tag',
+ help='''Create the release tag.''')
+ subparser.set_defaults(func=create_tag)
+ subparser.add_argument('version', type=Version,
+ help='''The release label, such as '1.7.0-alpha1'.''')
+ subparser.add_argument('revnum', type=int,
+ help='''The revision number to base the release on.''')
+ subparser.add_argument('--branch',
+ help='''The branch to base the release on.''')
+ subparser.add_argument('--username',
+ help='''Username for ''' + secure_repos + '''.''')
# The clean-dist subcommand
subparser = subparsers.add_parser('clean-dist',
@@ -766,6 +822,8 @@ def main():
subparser.set_defaults(func=clean_dist)
subparser.add_argument('--dist-dir',
help='''The directory to clean.''')
+ subparser.add_argument('--username',
+ help='''Username for ''' + dist_repos + '''.''')
# The move-to-dist subcommand
subparser = subparsers.add_parser('move-to-dist',
@@ -775,6 +833,8 @@ def main():
subparser.set_defaults(func=move_to_dist)
subparser.add_argument('version', type=Version,
help='''The release label, such as '1.7.0-alpha1'.''')
+ subparser.add_argument('--username',
+ help='''Username for ''' + dist_repos + '''.''')
# The write-news subcommand
subparser = subparsers.add_parser('write-news',
Modified: subversion/branches/compressed-pristines/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/tools/server-side/svn-rep-sharing-stats.c?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/branches/compressed-pristines/tools/server-side/svn-rep-sharing-stats.c Thu Aug 16 10:17:48 2012
@@ -42,8 +42,8 @@
static svn_error_t *
version(apr_pool_t *pool)
{
- return svn_opt_print_help3(NULL, "svn-rep-sharing-stats", TRUE, FALSE, NULL,
- NULL, NULL, NULL, NULL, NULL, pool);
+ return svn_opt_print_help4(NULL, "svn-rep-sharing-stats", TRUE, FALSE, FALSE,
+ NULL, NULL, NULL, NULL, NULL, NULL, pool);
}
static void
@@ -91,8 +91,8 @@ check_lib_versions(void)
{ "svn_fs", svn_fs_version },
{ NULL, NULL }
};
-
SVN_VERSION_DEFINE(my_version);
+
return svn_error_trace(svn_ver_check_list(&my_version, checklist));
}
Modified: subversion/branches/compressed-pristines/tools/server-side/svnauthz-validate.c
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/tools/server-side/svnauthz-validate.c?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/tools/server-side/svnauthz-validate.c (original)
+++ subversion/branches/compressed-pristines/tools/server-side/svnauthz-validate.c Thu Aug 16 10:17:48 2012
@@ -94,6 +94,7 @@ main(int argc, const char **argv)
if (err)
{
svn_handle_error2(err, stderr, FALSE, "svnauthz-validate: ");
+ svn_error_clear(err);
return 1;
}
else
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpredumpfilter.py
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/commit-hook.py
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/daemonize.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/example.conf
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/tools/server-side/svnpubsub/example.conf?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/tools/server-side/svnpubsub/example.conf (original)
+++ subversion/branches/compressed-pristines/tools/server-side/svnpubsub/example.conf Thu Aug 16 10:17:48 2012
@@ -2,115 +2,16 @@
[DEFAULT]
svnbin: /usr/local/bin/svn
-streams: http://svn-master.apache.org:2069/commits/xml
- http://dist.apache.org:2069/commits/xml
+streams: http://svn.example.org:2069/commits/xml
-ASF: http://svn-master.apache.org/repos/asf
-INFRA: https://svn-master.apache.org/repos/infra
-CMS: %(INFRA)s/websites/production
-DIST: https://dist.apache.org/repos/dist
+## The values below are used by ConfigParser's interpolation syntax.
+## See http://docs.python.org/library/configparser
+SOME_REPOS: svn://svn.example.org/repos/chaos
[env]
-HOME: /home/svnwc
+HOME: /home/svn
LANG: en_US.UTF-8
[track]
-/x1/www/apr.apache.org: %(ASF)s/apr/site/trunk/docs
-/x1/www/apr.apache.org/dev/dist: %(DIST)s/dev/apr
-/x1/www/www.apache.org/dist/apr: %(DIST)s/release/apr
-/x1/www/www.apache.org/dist/poi: %(DIST)s/release/poi
-/x1/www/www.apache.org/dist/pivot: %(DIST)s/release/pivot
-/x1/www/www.apache.org/dist/httpd: %(DIST)s/release/httpd
-/x1/www/www.apache.org/dist/incubator/airavata: %(DIST)s/release/incubator/airavata
-/x1/www/www.apache.org/: %(CMS)s/www
-/x1/www/httpd.apache.org/: %(ASF)s/httpd/site/trunk/docs
-/x1/www/httpd.apache.org/docs/2.0: %(ASF)s/httpd/httpd/branches/2.0.x/docs/manual
-/x1/www/httpd.apache.org/docs/2.2: %(ASF)s/httpd/httpd/branches/2.2.x/docs/manual
-/x1/www/httpd.apache.org/docs/1.3: %(ASF)s/httpd/httpd/branches/1.3.x/htdocs/manual
-/x1/www/httpd.apache.org/docs/2.4: %(ASF)s/httpd/httpd/branches/2.4.x/docs/manual
-/x1/www/httpd.apache.org/docs/trunk: %(ASF)s/httpd/httpd/trunk/docs/manual
-/x1/www/httpd.apache.org/mod_fcgid/mod: %(ASF)s/httpd/mod_fcgid/trunk/docs/manual/mod
-/x1/www/httpd.apache.org/mod_fcgid/style: %(ASF)s/httpd/httpd/trunk/docs/manual/style
-/x1/www/httpd.apache.org/mod_fcgid/images: %(ASF)s/httpd/httpd/trunk/docs/manual/images
-/x1/www/httpd.apache.org/dev/dist: %(DIST)s/dev/httpd
-/x1/www/httpd.apache.org/mod_ftp/mod: %(ASF)s/httpd/mod_ftp/trunk/docs/manual/mod
-/x1/www/httpd.apache.org/mod_ftp/style: %(ASF)s/httpd/httpd/trunk/docs/manual/style
-/x1/www/httpd.apache.org/mod_ftp/images: %(ASF)s/httpd/httpd/trunk/docs/manual/images
-/x1/www/httpd.apache.org/mod_ftp/ftp: %(ASF)s/httpd/mod_ftp/trunk/docs/manual/ftp
-/x1/www/libcloud.apache.org: %(CMS)s/libcloud
-/x1/www/river.apache.org: %(CMS)s/river/content
-/x1/www/incubator.apache.org/stanbol: %(CMS)s/stanbol/content/stanbol
-/x1/www/incubator.apache.org/kitty: %(CMS)s/kitty/content/kitty
-/x1/www/www.apache.org/dist/trafficserver: %(DIST)s/release/trafficserver
-/x1/staging/harmony.apache.org/eclipse/update: %(ASF)s/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.site
-/x1/staging/harmony.apache.org/externals/security: %(ASF)s/harmony/enhanced/java/trunk/classlib/doc/security
-/x1/staging/harmony.apache.org/externals/regex: %(ASF)s/harmony/enhanced/java/trunk/classlib/doc/regex
-/x1/staging/harmony.apache.org: %(ASF)s/harmony/standard/site/trunk/docs
-/x1/www/harmony.apache.org/eclipse/update: %(ASF)s/harmony/enhanced/tools/trunk/eclipse/org.apache.harmony.eclipse.site
-/x1/www/harmony.apache.org/externals/security: %(ASF)s/harmony/enhanced/java/trunk/classlib/doc/security
-/x1/www/harmony.apache.org/externals/regex: %(ASF)s/harmony/enhanced/java/trunk/classlib/doc/regex
-/x1/www/harmony.apache.org: %(ASF)s/harmony/standard/site/branches/live/docs
-/x1/www/subversion.apache.org/: %(ASF)s/subversion/site
-/x1/www/trafficserver.apache.org/: %(CMS)s/trafficserver
-/x1/www/qpid.apache.org: %(ASF)s/qpid/site/docs
-/x1/www/pdfbox.apache.org: %(ASF)s/pdfbox/site/publish
-/x1/www/cassandra.apache.org: %(ASF)s/cassandra/site/publish
-/x1/www/community.apache.org: %(CMS)s/community
-/x1/www/nutch.apache.org: %(ASF)s/nutch/site/publish
-/x1/www/wicket.apache.org: %(ASF)s/wicket/common/site/trunk/_site
-/x1/www/wicket.apache.org/apidocs: %(ASF)s/wicket/common/site/apidocs
-/x1/www/incubator.apache.org/callback: %(CMS)s/callback/content/callback
-/x1/www/incubator.apache.org/zetacomponents: %(ASF)s/incubator/zetacomponents/website/htdocs
-/x1/www/incubator.apache.org/flex: %(CMS)s/flex/content/flex
-/x1/www/incubator.apache.org/jena: %(CMS)s/jena/content/jena
-/x1/www/incubator.apache.org/celix: %(CMS)s/celix/content/celix
-/x1/www/incubator.apache.org/lucene.net: %(CMS)s/lucene.net/content/lucene.net
-/x1/www/incubator.apache.org/easyant: %(ASF)s/incubator/easyant/site/production
-/x1/www/incubator.apache.org/etch: %(CMS)s/etch/content/etch
-/x1/www/incubator.apache.org/rave: %(CMS)s/rave/content/rave
-/x1/www/incubator.apache.org/wave: %(CMS)s/wave/content/wave
-/x1/www/incubator.apache.org/lucy: %(CMS)s/lucy/content/lucy
-/x1/www/incubator.apache.org/openmeetings: %(ASF)s/incubator/openmeetings/trunk/singlewebapp/docs
-/x1/www/incubator.apache.org/openofficeorg: %(CMS)s/openofficeorg/content/openofficeorg
-/x1/www/incubator.apache.org/odftoolkit: %(CMS)s/odftoolkit/content/odftoolkit
-/x1/www/incubator.apache.org/airavata: %(CMS)s/airavata/content/airavata
-/x1/www/incubator.apache.org/wookie: %(CMS)s/wookie/content/wookie
-/x1/www/incubator.apache.org/accumulo: %(CMS)s/accumulo/content/accumulo
-/x1/www/gora.apache.org: %(ASF)s/gora/site/publish
-/x1/www/incubator.apache.org/devicemap: %(CMS)s/devicemap/content/devicemap
-/x1/www/aries.apache.org: %(CMS)s/aries/content
-/x1/www/tika.apache.org: %(ASF)s/tika/site/publish
-/x1/www/uima.apache.org/pubsub: %(ASF)s/uima/site/trunk/uima-website/docs
-/x1/www/zookeeper.apache.org: %(CMS)s/zookeeper
-/x1/www/chemistry.apache.org: %(CMS)s/chemistry
-/x1/www/ant.apache.org: %(ASF)s/ant/site/ant/production
-/x1/www/ant.apache.org/ivy: %(ASF)s/ant/site/ivy/production
-/x1/www/ant.apache.org/ivy/ivyde: %(ASF)s/ant/site/ivyde/production
-/x1/www/www.apache.org/dist/esme: %(DIST)s/release/esme
-/x1/www/www.apache.org/dist/libcloud: %(DIST)s/release/libcloud
-/x1/www/archive.apachecon.com: %(INFRA)s/apachecon/archive.apachecon.com
-/x1/www/oodt.apache.org: %(ASF)s/oodt/site
-/x1/www/esme.apache.org: %(CMS)s/esme/content
-/x1/www/ooo-site.apache.org: %(CMS)s/ooo-site
-/x1/www/openejb.apache.org: %(CMS)s/openejb
-/x1/www/deltacloud.apache.org: %(ASF)s/deltacloud/trunk/site/output
-/x1/www/ace.apache.org: %(CMS)s/ace
-/x1/www/stdcxx.apache.org/doc: %(ASF)s/stdcxx/trunk/doc
-/x1/www/stdcxx.apache.org: %(ASF)s/stdcxx/site
-/x1/www/www.apache.org/dist/tomcat: %(DIST)s/release/tomcat
-/x1/www/incubator.apache.org/any23: %(ASF)s/incubator/any23/site
-/x1/www/incubator.apache.org/bloodhound: %(ASF)s/incubator/bloodhound/site
-/x1/www/labs.apache.org/: %(CMS)s/labs
-/x1/www/lucene.apache.org: %(CMS)s/lucene
-/x1/www/lucene.apache.org/content/core/old_versioned_docs: %(ASF)s/lucene/old_versioned_docs
-/x1/www/pivot.apache.org: %(ASF)s/pivot/site/trunk/deploy
-/x1/www/www.apache.org/dist/empire-db: %(DIST)s/release/empire-db
-/x1/www/empire-db.apache.org: %(ASF)s/empire-db/site
-/x1/www/www.apache.org/dist/subversion: %(DIST)s/release/subversion
-/x1/www/avro.apache.org: %(ASF)s/avro/site/publish
-/x1/www/incubator.apache.org/cordova: %(ASF)s/incubator/cordova/site/public
-/x1/www/mahout.apache.org: %(ASF)s/mahout/site/new_website
-/x1/www/opennlp.apache.org: %(CMS)s/opennlp
-/x1/www/gump.apache.org: %(ASF)s/gump/site
-/x1/www/incubator.apache.org/syncope: %(ASF)s/incubator/syncope/site
-/x1/staging/www.apache.org: %(ASF)s/infrastructure/site/branches/flamebait/docs
+/usr/local/foo/prod: %(SOME_REPOS)/foo/production
+/usr/local/foo/dev: %(SOME_REPOS)/foo/trunk
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnpubsub/__init__.py
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnpubsub/client.py
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnpubsub/server.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svntweet.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svntweet.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svntweet.py (original)
+++ subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svntweet.py Thu Aug 16 10:17:48 2012
@@ -23,7 +23,7 @@
# svntweet.py my-config.json
#
# With my-config.json containing stream paths and the twitter auth info:
-# {"stream": "http://svn-master.apache.org:2069/commits/xml",
+# {"stream": "http://svn.apache.org:2069/commits/xml",
# "username": "asfcommits",
# "password": "MyLuggageComboIs1234"}
#
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svntweet.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnwcsub.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnwcsub.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnwcsub.py (original)
+++ subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnwcsub.py Thu Aug 16 10:17:48 2012
@@ -110,6 +110,8 @@ class WorkingCopy(object):
logging.info("autopopulate %s from %s" % (self.path, self.url))
subprocess.check_call([svnbin, 'co', '-q',
'--non-interactive',
+ '--config-option',
+ 'config:miscellany:use-commit-times=on',
'--', self.url, self.path],
env=env)
@@ -242,6 +244,8 @@ class BackgroundWorker(threading.Thread)
'--non-interactive',
'--trust-server-cert',
'--ignore-externals',
+ '--config-option',
+ 'config:miscellany:use-commit-times=on',
wc.path]
subprocess.check_call(args, env=self.env)
@@ -257,6 +261,8 @@ class BackgroundWorker(threading.Thread)
args = [self.svnbin, 'cleanup',
'--non-interactive',
'--trust-server-cert',
+ '--config-option',
+ 'config:miscellany:use-commit-times=on',
wc.path]
subprocess.check_call(args, env=self.env)
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnwcsub.py
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/testserver.py
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/compressed-pristines/tools/server-side/svnpubsub/watcher.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/compressed-pristines/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/win-tests.py?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/win-tests.py (original)
+++ subversion/branches/compressed-pristines/win-tests.py Thu Aug 16 10:17:48 2012
@@ -65,6 +65,8 @@ def _usage_exit():
print(" -t, --test=TEST : Run the TEST test (all is default); use")
print(" TEST#n to run a particular test number,")
print(" multiples also accepted e.g. '2,4-7'")
+ print(" --log-level=LEVEL : Set log level to LEVEL (E.g. DEBUG)")
+ print(" --log-to-stdout : Write log results to stdout")
print(" --svnserve-args=list : comma-separated list of arguments for")
print(" svnserve")
@@ -76,10 +78,10 @@ def _usage_exit():
print(" will be used, if not specified")
print(" --httpd-daemon : Run Apache httpd as daemon")
print(" --httpd-service : Run Apache httpd as Windows service (default)")
- print(" --http-library : dav library to use, neon (default) or serf")
print(" --http-short-circuit : Use SVNPathAuthz short_circuit on HTTP server")
print(" --disable-http-v2 : Do not advertise support for HTTPv2 on server")
print(" --disable-bulk-updates : Disable bulk updates on HTTP server")
+ print(" --ssl-cert : Path to SSL server certificate to trust.")
print(" --javahl : Run the javahl tests instead of the normal tests")
print(" --list : print test doc strings only")
print(" --milestone-filter=RE : RE is a regular expression pattern that (when")
@@ -93,10 +95,9 @@ def _usage_exit():
print(" -p, --parallel : run multiple tests in parallel")
print(" --server-minor-version : the minor version of the server being")
print(" tested")
- print(" --config-file : Configuration file for tests")
- print(" --fsfs-sharding : Specify shard size (for fsfs)")
- print(" --fsfs-packing : Run 'svnadmin pack' automatically")
- print(" --log-to-stdout : Write log results to stdout")
+ print(" --config-file : Configuration file for tests")
+ print(" --fsfs-sharding : Specify shard size (for fsfs)")
+ print(" --fsfs-packing : Run 'svnadmin pack' automatically")
sys.exit(0)
@@ -126,12 +127,13 @@ opts, args = my_getopt(sys.argv[1:], 'hr
['release', 'debug', 'verbose', 'quiet', 'cleanup',
'test=', 'url=', 'svnserve-args=', 'fs-type=', 'asp.net-hack',
'httpd-dir=', 'httpd-port=', 'httpd-daemon',
- 'httpd-server', 'http-library=', 'http-short-circuit',
+ 'httpd-server', 'http-short-circuit',
'disable-http-v2', 'disable-bulk-updates', 'help',
'fsfs-packing', 'fsfs-sharding=', 'javahl',
'list', 'enable-sasl', 'bin=', 'parallel',
- 'config-file=', 'server-minor-version=',
- 'log-to-stdout', 'mode-filter=', 'milestone-filter='])
+ 'config-file=', 'server-minor-version=', 'log-level=',
+ 'log-to-stdout', 'mode-filter=', 'milestone-filter=',
+ 'ssl-cert='])
if len(args) > 1:
print('Warning: non-option arguments after the first one will be ignored')
@@ -146,7 +148,6 @@ svnserve_args = None
run_httpd = None
httpd_port = None
httpd_service = None
-http_library = 'neon'
http_short_circuit = False
advertise_httpv2 = True
http_bulk_updates = True
@@ -163,6 +164,8 @@ config_file = None
log_to_stdout = None
mode_filter=None
tests_to_run = []
+log_level = None
+ssl_cert = None
for opt, val in opts:
if opt in ('-h', '--help'):
@@ -197,8 +200,6 @@ for opt, val in opts:
httpd_service = 0
elif opt == '--httpd-service':
httpd_service = 1
- elif opt == '--http-library':
- http_library = val
elif opt == '--http-short-circuit':
http_short_circuit = True
elif opt == '--disable-http-v2':
@@ -230,6 +231,10 @@ for opt, val in opts:
config_file = val
elif opt == '--log-to-stdout':
log_to_stdout = 1
+ elif opt == '--log-level':
+ log_level = val
+ elif opt == '--ssl-cert':
+ ssl_cert = val
# Calculate the source and test directory names
abs_srcdir = os.path.abspath("")
@@ -530,6 +535,12 @@ class Httpd:
fp.write(self._svn_module('dav_svn_module', 'mod_dav_svn.so'))
fp.write(self._svn_module('authz_svn_module', 'mod_authz_svn.so'))
+ # Don't handle .htaccess, symlinks, etc.
+ fp.write('<Directory />\n')
+ fp.write('AllowOverride None\n')
+ fp.write('Options None\n')
+ fp.write('</Directory>\n\n')
+
# Define two locations for repositories
fp.write(self._svn_repo('repositories'))
fp.write(self._svn_repo('local_tmp'))
@@ -558,9 +569,10 @@ class Httpd:
def _create_users_file(self):
"Create users file"
htpasswd = os.path.join(self.httpd_dir, 'bin', 'htpasswd.exe')
- os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-mbc', self.httpd_users,
+ # Create the cheapest to compare password form for our testsuite
+ os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-bcp', self.httpd_users,
'jrandom', 'rayjandom'])
- os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-mb', self.httpd_users,
+ os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-bp', self.httpd_users,
'jconstant', 'rayjandom'])
def _create_mime_types_file(self):
@@ -656,8 +668,6 @@ if create_dirs:
baton = copied_execs
for dirpath, dirs, files in os.walk('subversion'):
copy_execs(baton, dirpath, dirs + files)
- for dirpath, dirs, files in os.walk('tools/client-side/svnmucc'):
- copy_execs(baton, dirpath, dirs + files)
except:
os.chdir(old_cwd)
raise
@@ -731,12 +741,13 @@ if not test_javahl:
th = run_tests.TestHarness(abs_srcdir, abs_builddir,
log_file,
fail_log_file,
- base_url, fs_type, http_library,
+ base_url, fs_type, 'serf',
server_minor_version, not quiet,
cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing,
list_tests, svn_bin, mode_filter,
- milestone_filter)
+ milestone_filter,
+ set_log_level=log_level, ssl_cert=ssl_cert)
old_cwd = os.getcwd()
try:
os.chdir(abs_builddir)