aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2015-07-11 10:44:20 -0400
committerJack Lloyd <[email protected]>2015-07-11 10:44:20 -0400
commitce7245ab98cd7cd336ff6273bf2a93743d263e06 (patch)
tree8b558c2d41dfae23371e46457afead8aed8dc558
parentcaeb53721d1ed0efc386017a4482c104cc09946c (diff)
Remove dead code (Boost.Python makefile, unused configure.py functions)
-rwxr-xr-xconfigure.py13
-rw-r--r--src/build-data/makefile/python.in26
2 files changed, 0 insertions, 39 deletions
diff --git a/configure.py b/configure.py
index 7eb584c4f..fb5a8e3bd 100755
--- a/configure.py
+++ b/configure.py
@@ -42,19 +42,6 @@ def chunks(l, n):
for i in range(0, len(l), n):
yield l[i:i+n]
-def is_official_release():
- # Assume a release date implies official release
- return (botan_version.release_datestamp > 20130000)
-
-def default_build_mode():
- if os.getenv('CONTINUOUS_INTEGRATION') == 'true' or \
- os.getenv('GO_ENVIRONMENT_NAME') == 'Botan':
- return 'maintainer'
-
- if is_official_release():
- return 'release'
- return 'debug'
-
def get_vc_revision():
def get_vc_revision(cmdlist):
diff --git a/src/build-data/makefile/python.in b/src/build-data/makefile/python.in
deleted file mode 100644
index f6e49ee75..000000000
--- a/src/build-data/makefile/python.in
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Build commands for Python wrapper
-PYTHON_ROOT = /usr/lib/python%{python_version}/config
-PYTHON_INC = -I/usr/include/python%{python_version}
-PYTHON_SITE_PACKAGE_DIR = /usr/lib/python%{python_version}/site-packages/
-
-PYTHON_FLAGS = -I%{python_dir} -fPIC -ftemplate-depth-255 $(WARN_FLAGS) $(PYTHON_INC) $(CFLAGS)
-
-BOTAN_PYTHON_MODDIR = %{python_obj_dir}
-
-PYTHON_OBJS = %{python_objs}
-
-python: $(BOTAN_PYTHON_MODDIR)/_botan.so
-
-PYTHON_FLAGS = $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS) -Os -ftemplate-depth=255 $(PYTHON_INC) -Wno-error
-
-%{python_build_cmds}
-
-$(BOTAN_PYTHON_MODDIR)/_botan.so: $(PYTHON_OBJS)
- cp %{python_dir}/*.py $(BOTAN_PYTHON_MODDIR)
- $(CXX) -shared -Wl,-soname,$@ $(PYTHON_OBJS) -L. -L$(PYTHON_ROOT) $(LDFLAGS) -lbotan-$(BRANCH) -lboost_python-%{python_version} -o $@
-
-install_python:
- mkdir -p $(PYTHON_SITE_PACKAGE_DIR)/botan
- cp $(BOTAN_PYTHON_MODDIR)/_botan.so $(BOTAN_PYTHON_MODDIR)/*.py $(PYTHON_SITE_PACKAGE_DIR)/botan
- chmod -R u=rwX,go=rX $(PYTHON_SITE_PACKAGE_DIR)/botan