Install sage-env-config with sage_conf

sagemath · Jul 4, 2020 · 6bc0cd4 · 6bc0cd4
1 parent c5f7f2f
commit 6bc0cd4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/build/pkgs/sage_conf/dependencies b/build/pkgs/sage_conf/dependencies
@@ -1 +1 @@
-$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg | $(PYTHON_TOOLCHAIN)
+$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg ../pkgs/sage_conf/src/bin/sage-env-config | $(PYTHON_TOOLCHAIN)
diff --git a/build/pkgs/sage_conf/src/MANIFEST.in b/build/pkgs/sage_conf/src/MANIFEST.in
@@ -0,0 +1 @@
+include bin/sage-env-config
diff --git a/build/pkgs/sage_conf/src/bin/sage-env-config b/build/pkgs/sage_conf/src/bin/sage-env-config
@@ -0,0 +1 @@
+../../../../../src/bin/sage-env-config
diff --git a/build/pkgs/sage_conf/src/setup.cfg.in b/build/pkgs/sage_conf/src/setup.cfg.in
@@ -14,6 +14,9 @@ url = https://www.sagemath.org
 py_modules =
     sage_conf
 
+scripts =
+    bin/sage-env-config
+
 [options.entry_points]
 console_scripts =
     sage-config = sage_conf:_main
diff --git a/src/setup.py b/src/setup.py
@@ -140,8 +140,8 @@
                  ## Uncategorized scripts in alphabetical order
                  'bin/math-readline',
                  'bin/sage-env',
-                 'bin/sage-env-config',
-                 # sage-env-config.in -- not to be installed',
+                 # sage-env-config -- installed by sage_conf
+                 # sage-env-config.in -- not to be installed
                  'bin/sage-gdb-commands',
                  'bin/sage-grep',
                  'bin/sage-grepdoc',
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg \| $(PYTHON_TOOLCHAIN)
		$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg ../pkgs/sage_conf/src/bin/sage-env-config \| $(PYTHON_TOOLCHAIN)