Strip the install and package dependencies

niess · niess · commit ad0c8dfdccf8 · 2019-06-08T02:56:38.000+02:00
diff --git a/.travis/script.sh b/.travis/script.sh
@@ -7,9 +7,8 @@ if [ -n "${OPENSSL}" ]; then
     source .travis/openssl-config.sh
     export PATH="${HOME}/${OPENSSL_DIR}/bin:${PATH}"
     export CFLAGS="${CFLAGS} -I${HOME}/${OPENSSL_DIR}/include"
-    # rpath on linux will cause it to use an absolute path so we don't need to
-    # do LD_LIBRARY_PATH
     export LDFLAGS="-L${HOME}/${OPENSSL_DIR}/lib -Wl,-rpath=${HOME}/${OPENSSL_DIR}/lib"
+    export LD_LIBRARY_PATH="${HOME}/${OPENSSL_DIR}/lib:${LD_LIBRARY_PATH}"
 fi
 
 
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ are located on the [wiki][WIKI_DEVS].
 Ready to use [AppImage][APPIMAGE] distributions of [Python][PYTHON] are provided
 [below](##Downloads) or in the [release][RELEASE] area. A one liner example is:
 ```
-wget -cq https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/python3-$(arch).AppImage && chmod u+x python3-$(arch).AppImage && ./python3-$(arch).AppImage
+wget -cq https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/python3-x86_64.AppImage && chmod u+x python3-x86_64.AppImage && ./python3-x86_64.AppImage
 ```
 which will install and run a [Python][PYTHON] instance.  See the instructions on
 the [wiki][WIKI_USERS] for more detailed usage.
diff --git a/linuxdeploy-plugin-python.sh b/linuxdeploy-plugin-python.sh
@@ -134,7 +134,10 @@ fi
 
 # Prune the install
 cd "$APPDIR/usr"
-rm -rf "bin/python"*"-config" "bin/idle"* "include" "lib/pkgconfig" "share/doc" "share/man"
+rm -rf "bin/python"*"-config" "bin/idle"* "include" "lib/pkgconfig" \
+       "share/doc" "share/man" "lib/libpython"*".a" "lib/python"*"/test" \
+       "lib/python"*"/config-"*"-x86_64-linux-gnu"
+
 
 
 # Wrap the Python executables
diff --git a/share/python-wrapper.sh b/share/python-wrapper.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
+
 # Resolve symlinks within the image
 nickname="{{PYTHON}}"
 executable="${APPDIR}/usr/bin/${nickname}"
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
@@ -86,7 +86,7 @@ def test_python3_base(self):
         """
         appimage, version = "python3-x86_64.AppImage", PYTHON3_VERSION
         if not os.path.exists(os.path.join(TESTDIR, appimage)):
-            self.build_python_appimage("python3")
+            self.build_python_appimage(PYTHON3_VERSION)
         self.check_base(appimage, version)
 
 
@@ -103,7 +103,7 @@ def test_python2_base(self):
         appimage, version = "python2-x86_64.AppImage", PYTHON2_VERSION
         if not os.path.exists(os.path.join(TESTDIR, appimage)):
             self.build_python_appimage(
-                "python2", PYTHON_SOURCE=python_url(version))
+                PYTHON2_VERSION, PYTHON_SOURCE=python_url(version))
         self.check_base(appimage, version)
 
 
@@ -181,9 +181,12 @@ def bash(cmd):
                             version, str(python)))
 
 
-    def build_python_appimage(self, exe, **kwargs):
+    def build_python_appimage(self, version, **kwargs):
         """Build a Python AppImage using linux-deploy-python
         """
+        nickname = "python" + version[0]
+        exe = ".python" + version[:3]
+
         appdir = TESTDIR +  "/AppDir"
         if os.path.exists(appdir):
             shutil.rmtree(appdir)
@@ -194,33 +197,41 @@ def build_python_appimage(self, exe, **kwargs):
 
         # Create generic resources for the application deployement
         src = ROOTDIR + "/appimage/resources/linuxdeploy-plugin-python.png"
-        icon = os.path.join(resdir, exe + ".png")
+        icon = os.path.join(resdir, nickname + ".png")
         shutil.copy(src, icon)
 
-        desktop = os.path.join(resdir, exe + ".desktop")
+        desktop = os.path.join(resdir, nickname + ".desktop")
         with open(desktop, "w") as f:
             f.write("""\
 [Desktop Entry]
 Categories=Science;Engineering;
 Type=Application
 Icon={0:}
-Exec={0:}
+Exec={1:}
 Name={0:}
-""".format(exe))
-
-        command = ("./" + LINUX_DEPLOY,
-            "--appdir", str(appdir),
-            "-i", str(icon),
-            "-d", str(desktop),
-            "--plugin", "python",
-            "--output", "appimage")
-
-        env = os.environ.copy()
-        env.update(kwargs)
-        system(" ".join(command), env=env)
+""".format(nickname, exe))
+
+        for index in range(2):
+            command = ["./" + LINUX_DEPLOY,
+                "--appdir", appdir,
+                "-i", icon,
+                "-d", desktop]
+            if index == 0:
+                command += [
+                    "--plugin", "python"]
+            else:
+                command += [
+                    "-e", os.path.join(appdir, "usr", "bin", exe),
+                    "--custom-apprun", os.path.join(appdir, "usr", "bin",
+                                                    nickname),
+                    "--output", "appimage"]
+
+            env = os.environ.copy()
+            env.update(kwargs)
+            system(" ".join(command), env=env)
 
         shutil.copy(
-            TESTDIR + "/{:}-{:}.AppImage".format(exe, os.environ["ARCH"]),
+            TESTDIR + "/{:}-{:}.AppImage".format(nickname, os.environ["ARCH"]),
             ROOTDIR + "/appimage")
 
 
