cleanup: remove SVN stuff

This commit is contained in:
Thomas Holder
2019-02-12 16:58:50 +01:00
parent 7ad6acefa6
commit 09ad21e3ed
7 changed files with 8 additions and 29 deletions

4
.gitignore vendored Normal file
View File

@@ -0,0 +1,4 @@
*.pyc
*.d
generated
build

View File

@@ -1,12 +0,0 @@
.git
.gitignore
.svn
.svnignore
*.pyc
*.d
contrib/sglite
generated
build
pymol
debug
data/mm

View File

@@ -128,20 +128,11 @@ def create_buildinfo(outputdir, pymoldir='.'):
except OSError:
sha = ''
rev = 0
try:
for line in Popen(['svn', 'info'], cwd=pymoldir, stdout=PIPE).stdout:
if line.startswith(b'Last Changed Rev'):
rev = int(line.split()[3])
except OSError:
pass
with openw(os.path.join(outputdir, 'PyMOLBuildInfo.h')) as out:
print('''
#define _PyMOL_BUILD_DATE %d
#define _PYMOL_BUILD_GIT_SHA "%s"
#define _PyMOL_BUILD_SVN_REV %d
''' % (time.time(), sha, rev), file=out)
''' % (time.time(), sha), file=out)
if __name__ == "__main__":
create_shadertext(*sys.argv[1:6])

View File

@@ -2060,7 +2060,7 @@ static PyObject *CmdGetVersion(PyObject * self, PyObject * args)
#ifdef _PyMOL_BUILD_DATE
_PyMOL_BUILD_DATE,
_PYMOL_BUILD_GIT_SHA,
_PyMOL_BUILD_SVN_REV
0
#else
0, "", 0
#endif

View File

@@ -177,9 +177,6 @@ def get_version_message(v=None):
p += "Incentive Product" if invocation.options.incentive_product else \
"Open-Source"
if v[5]:
p += ", svn rev %s" % v[5]
return p
def guess_pymol_path():

View File

@@ -46,8 +46,6 @@ ARGUMENTS
body += 'build date: %s %s\n' % (time.ctime(version[3]), TZ)
if version[4]:
body += 'git sha: %s\n' % version[4]
if version[5]:
body += "svn rev: %s\n" % version[5]
try:
# pymol conda package version

View File

@@ -165,7 +165,8 @@ class install_pymol(install):
return name
def copy_tree_nosvn(self, src, dst):
ignore = lambda src, names: set(['.svn']).intersection(names)
ignore = lambda src, names: set([
]).intersection(names)
if os.path.exists(dst):
shutil.rmtree(dst)
print('copying %s -> %s' % (src, dst))