diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-12-31 08:46:22 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-12-31 08:46:22 +0000 |
commit | b53bfd4d41252426cb050ef896676034d92e3ef7 (patch) | |
tree | 5d03aedc0a408da049390e8e9d8a7d28ad596c49 /rdiff-backup/dist | |
parent | c08ca27a381443d6e72ee8d16269e5a535df58d1 (diff) | |
download | rdiff-backup-b53bfd4d41252426cb050ef896676034d92e3ef7.tar.gz |
Various changes for v0.11.1 (see CHANGELOG)
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@256 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/dist')
-rwxr-xr-x | rdiff-backup/dist/makedist | 26 | ||||
-rwxr-xr-x | rdiff-backup/dist/makerpm | 18 |
2 files changed, 19 insertions, 25 deletions
diff --git a/rdiff-backup/dist/makedist b/rdiff-backup/dist/makedist index bf68184..c1822c3 100755 --- a/rdiff-backup/dist/makedist +++ b/rdiff-backup/dist/makedist @@ -2,7 +2,7 @@ import os, re, shutil, time, sys, getopt -SourceDir = "src" +SourceDir = "rdiff_backup" DistDir = "dist" # Various details about the files must also be specified by the rpm @@ -89,15 +89,15 @@ def MakeTar(): assert not os.system("cp %s %s" % (filename, tardir)), filename os.mkdir(tardir+"/rdiff_backup") - for filename in ["connection.py", "destructive_stepping.py", + for filename in ["backup.py", "connection.py", "FilenameMapping.py", "Hardlink.py", - "highlevel.py", "increment.py", "__init__.py", - "iterfile.py", "lazy.py", "librsync.py", - "log.py", "Main.py", "manage.py", "MiscStats.py", - "Rdiff.py", "restore.py", "rlist.py", - "robust.py", "rorpiter.py", "rpath.py", "Security.py", - "selection.py", "SetConnections.py", "static.py", - "statistics.py", "Time.py"]: + "increment.py", "__init__.py", "iterfile.py", + "lazy.py", "librsync.py", "log.py", "Main.py", + "manage.py", "metadata.py", "Rdiff.py", + "restore.py", "robust.py", "rorpiter.py", + "rpath.py", "Security.py", "selection.py", + "SetConnections.py", "static.py", + "statistics.py", "TempFile.py", "Time.py"]: assert not os.system("cp %s/%s %s/rdiff_backup" % (SourceDir, filename, tardir)), filename @@ -137,10 +137,10 @@ def parse_cmdline(arglist): def Main(): action = parse_cmdline(sys.argv[1:]) - if action == "FAQ": - print "Making FAQ" - MakeFAQ() - else: + print "Making FAQ" + MakeFAQ() + + if action != "FAQ": assert action == "All" print "Processing version " + Version tarfile = MakeTar() diff --git a/rdiff-backup/dist/makerpm b/rdiff-backup/dist/makerpm index 8f59f65..2f275b2 100755 --- a/rdiff-backup/dist/makerpm +++ b/rdiff-backup/dist/makerpm @@ -2,7 +2,7 @@ import os, sys, re -SourceDir = "src" +rpmroot = "/home/ben/rpm" if len(sys.argv) == 2: version = sys.argv[1] @@ -20,15 +20,9 @@ tarfile = "-".join(base.split("-")[:-1]) + ".tar.gz" # These assume the rpm root directory $HOME/rpm. The # nonstandard location allows for building by non-root user. -assert not os.system("cp %s $HOME/rpm/SOURCES" % (tarfile,)) -assert not os.system("rpm -ba --sign -vv --target i386 " + specfile) -assert not os.system("cp $HOME/rpm/RPMS/i386/%s ." % i386rpm) -assert not os.system("cp $HOME/rpm/SRPMS/%s ." % source_rpm) +assert not os.system("cp %s %s/SOURCES" % (tarfile, rpmroot)) +#assert not os.system("rpm -ba --sign -vv --target i386 " + specfile) +assert not os.system("rpmbuild -ba -v " + specfile) +assert not os.system("cp %s/RPMS/i386/%s ." % (rpmroot, i386rpm)) +assert not os.system("cp %s/SRPMS/%s ." % (rpmroot, source_rpm)) -# Old root RPM instructions -#assert not os.system("install -o root -g root -m 644 %s " -# "/usr/src/redhat/SOURCES" % (tarfile,)) -#assert not os.system("install -o ben -g ben -m 644 " -# "/usr/src/redhat/RPMS/i386/%s ." % i386rpm) -#assert not os.system("install -o ben -g ben -m 644 " -# "/usr/src/redhat/SRPMS/%s ." % source_rpm) |