Author: bugman
Date: Thu Oct 2 15:27:35 2008
New Revision: 7494
URL: http://svn.gna.org/viewcvs/relax?rev=7494&view=rev
Log:
Merged revisions 7442 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r7442 | bugman | 2008-09-29 23:13:08 +0200 (Mon, 29 Sep 2008) | 14 lines
Merged r7434 from the 1.3.1 tag, the updates to the distribution file
creation.
The command used was:
svn merge -r7433:7434 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/1.3.1 .
.....
r7434 | bugman | 2008-09-29 00:41:59 +0200 (Mon, 29 Sep 2008) | 5 lines
Redesigned the packaging of the distribution files.
The GPG key name is now passed into scons and the user manual is no
longer compiled.
.....
........
Modified:
branches/pipe_refs/ (props changed)
branches/pipe_refs/scons/distrib.py
branches/pipe_refs/sconstruct
Propchange: branches/pipe_refs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 2 15:27:35 2008
@@ -1,1 +1,1 @@
-/1.3:1-7440
+/1.3:1-7493
Modified: branches/pipe_refs/scons/distrib.py
URL:
http://svn.gna.org/viewcvs/relax/branches/pipe_refs/scons/distrib.py?rev=7494&r1=7493&r2=7494&view=diff
==============================================================================
--- branches/pipe_refs/scons/distrib.py (original)
+++ branches/pipe_refs/scons/distrib.py Thu Oct 2 15:27:35 2008
@@ -24,6 +24,7 @@
# Import statements.
from os import getcwd, path, sep, system, walk
from re import search
+import sys
from tarfile import TarFile
from zipfile import ZipFile
@@ -45,6 +46,12 @@
if type_list[0] == 'ALL':
type_list = ['zip', 'tar']
+ # GPG key.
+ key = env['GPG_KEY']
+ if key == None:
+ sys.stderr.write("The GPG key needs to be supplied on the command
line as key=xxxxx, where xxxxx is the name of your key.\n\n")
+ return
+
# Loop over the distribution files.
for dist_type in type_list:
# The file name.
@@ -57,7 +64,7 @@
print "\n\nSigning the distribution package " + `file` + ".\n"
# Run the 'gpg' command.
- system("gpg --detach-sign --default-key relax " + path.pardir +
path.sep + file)
+ system("gpg --detach-sign --default-key " + key + " " + path.pardir
+ path.sep + file)
# Final print out.
print "\n\n\n"
Modified: branches/pipe_refs/sconstruct
URL:
http://svn.gna.org/viewcvs/relax/branches/pipe_refs/sconstruct?rev=7494&r1=7493&r2=7494&view=diff
==============================================================================
--- branches/pipe_refs/sconstruct (original)
+++ branches/pipe_refs/sconstruct Thu Oct 2 15:27:35 2008
@@ -4,7 +4,7 @@
###############################################################################
#
#
-# Copyright (C) 2006 Edward d'Auvergne
#
+# Copyright (C) 2006-2008 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -138,6 +138,12 @@
DIST_TYPE = 'tar'
+# GPG key.
+##########
+
+GPG_KEY = ARGUMENTS.get('key')
+
+
# Documentation.
################
@@ -205,7 +211,6 @@
binary_dist_env.dummy(target='binary_dist', source=None)
binary_dist_env.Depends('binary_dist', 'version_check') #
First check the program version number.
binary_dist_env.Depends('binary_dist', self.relax_fit_object) #
Compile the C code.
- binary_dist_env.Depends('binary_dist', 'user_manual_pdf') #
Compile the PDF version of the user manual.
binary_dist_env.Depends('binary_dist', 'manual_clean_nodeps') #
Clean up the temporary manual files.
binary_dist_env.Depends('binary_dist', 'clean') #
Then clean up all other temporary files.
binary_dist_env.Depends('binary_dist', 'package_bin') #
Package the binary distribution.
@@ -215,7 +220,6 @@
source_dist_env = Environment(BUILDERS={'dummy' :
Builder(action=self.dummy)})
source_dist_env.dummy(target='source_dist', source=None)
source_dist_env.Depends('source_dist', 'version_check') #
First check the program version number.
- source_dist_env.Depends('source_dist', 'user_manual_pdf') #
Compile the PDF version of the user manual.
source_dist_env.Depends('source_dist', 'manual_clean_nodeps') #
Clean up the temporary manual files.
source_dist_env.Depends('source_dist', 'clean_all') #
Then clean up the sources.
source_dist_env.Depends('source_dist', 'package_src') #
Package the source distribution.
@@ -238,14 +242,16 @@
# Target for creating a GPG signature of the binary distribution
file.
gpg_bin_env = Environment(BUILDERS={'sign' :
Builder(action=gpg_sign)},
DIST_FILE=BIN_FILE,
- DIST_TYPE=DIST_TYPE)
+ DIST_TYPE=DIST_TYPE,
+ GPG_KEY=GPG_KEY)
gpg_bin_env.sign(target='gpg_bin', source=None)
gpg_bin_env.Depends('gpg_bin', 'version_check') # Check the
program version number before signing.
# Target for creating a GPG signature of the source distribution
file.
gpg_src_env = Environment(BUILDERS={'sign' :
Builder(action=gpg_sign)},
DIST_FILE=SRC_FILE,
- DIST_TYPE='ALL')
+ DIST_TYPE='ALL',
+ GPG_KEY=GPG_KEY)
gpg_src_env.sign(target='gpg_src', source=None)
gpg_src_env.Depends('gpg_src', 'version_check') # Check the
program version number before signing.
r7494 - in /branches/pipe_refs: ./ scons/distrib.py sconstruct