Merge pull request #319 from loathingKernel/selfcontained

Make protonfixes self-contained

Author: GloriousEggroll

Makefile

@@ -1,8 +1,13 @@
-OBJDIR  := builddir
+BUILD ?= build
+DIST  ?= dist
 
-PREFIX      ?= /usr
-DESTDIR     ?=
-INSTALL_DIR ?= $(shell pwd)/dist/protonfixes
+OBJDIR := $(shell realpath $(BUILD))
+DSTDIR := $(shell realpath $(DIST))
+TARGET_DIR := $(DSTDIR)
+
+BASEDIR       := /files
+i386_LIBDIR    = $(BASEDIR)/lib/i386-linux-gnu
+x86_64_LIBDIR  = $(BASEDIR)/lib/x86_64-linux-gnu
 
 .PHONY: all
 
@@ -21,23 +26,32 @@ install: protonfixes-install cabextract-install libmspack-install unzip-install
 
 protonfixes-install: protonfixes
 	$(info :: Installing protonfixes )
-	install -d              $(INSTALL_DIR)
-	cp      -r gamefixes-*  $(INSTALL_DIR)
-	cp      -r verbs        $(INSTALL_DIR)
-	cp         *.py         $(INSTALL_DIR)
-	cp         winetricks   $(INSTALL_DIR)
-	cp         umu-database.csv   $(INSTALL_DIR)
-	rm $(INSTALL_DIR)/protonfixes_test.py
+	install -d              $(TARGET_DIR)
+	cp      -r gamefixes-*  $(TARGET_DIR)
+	cp      -r verbs        $(TARGET_DIR)
+	cp         *.py         $(TARGET_DIR)
+	mkdir   -p              $(TARGET_DIR)$(BASEDIR)/bin
+	cp         winetricks   $(TARGET_DIR)$(BASEDIR)/bin
+	cp         winetricks   $(TARGET_DIR)
+	cp         umu-database.csv   $(TARGET_DIR)
+	rm $(TARGET_DIR)/protonfixes_test.py
+
+#
+# libmspack and cabextract
+#
+
+$(OBJDIR)/libmspack: | $(OBJDIR)
+	rsync -arx --delete subprojects/libmspack $(OBJDIR)
 
 #
 # cabextract
 #
 
-$(OBJDIR)/.build-cabextract-dist: | $(OBJDIR)
+$(OBJDIR)/.build-cabextract-dist: | $(OBJDIR)/libmspack
 	$(info :: Building cabextract )
-	cd subprojects/libmspack/cabextract && \
-	./autogen.sh && \
-	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man && \
+	cd $(OBJDIR)/libmspack/cabextract && \
+	autoreconf -fiv -I /usr/share/gettext/m4/ && \
+	./configure --prefix=$(BASEDIR) --libdir=$(x86_64_LIBDIR) && \
 	make
 	touch $(@)
 
@@ -47,20 +61,19 @@ cabextract-dist: $(OBJDIR)/.build-cabextract-dist
 
 cabextract-install: cabextract-dist
 	$(info :: Installing cabextract )
-	cd subprojects/libmspack/cabextract && \
-	make DESTDIR=$(INSTALL_DIR) install
-	cp $(INSTALL_DIR)/usr/bin/cabextract $(INSTALL_DIR)
-	rm -r $(INSTALL_DIR)/usr
+	cd $(OBJDIR)/libmspack/cabextract && \
+	make DESTDIR=$(TARGET_DIR) install
+	rm -r $(TARGET_DIR)$(BASEDIR)/share
 
 #
 # libmspack
 #
 
-$(OBJDIR)/.build-libmspack-dist: | $(OBJDIR)
+$(OBJDIR)/.build-libmspack-dist: | $(OBJDIR)/libmspack
 	$(info :: Building libmspack )
-	cd subprojects/libmspack/libmspack && \
+	cd $(OBJDIR)/libmspack/libmspack && \
 	autoreconf -vfi && \
-	./configure --prefix=/usr --disable-static --sysconfdir=/etc --localstatedir=/var && \
+	./configure --prefix=$(BASEDIR) --libdir=$(x86_64_LIBDIR) --disable-static && \
 	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool && \
 	make
 	touch $(@)
@@ -71,11 +84,11 @@ libmspack-dist: $(OBJDIR)/.build-libmspack-dist
 
 libmspack-install: libmspack-dist
 	$(info :: Installing libmspack )
-	cd subprojects/libmspack/libmspack && \
-	make DESTDIR=$(INSTALL_DIR) install
-	cp -d $(INSTALL_DIR)/usr/lib/libmspack* $(INSTALL_DIR)
-	rm -r $(INSTALL_DIR)/usr
-	rm    $(INSTALL_DIR)/libmspack.la
+	cd $(OBJDIR)/libmspack/libmspack && \
+	make DESTDIR=$(TARGET_DIR) install
+	rm -r $(TARGET_DIR)$(BASEDIR)/include
+	rm -r $(TARGET_DIR)$(BASEDIR)/lib/x86_64-linux-gnu/pkgconfig
+	rm    $(TARGET_DIR)$(BASEDIR)/lib/x86_64-linux-gnu/libmspack.la
 
 #
 # unzip
@@ -92,9 +105,10 @@ UNZIP_PATCHES := $(shell cat subprojects/unzip/debian/patches/series)
 
 $(OBJDIR)/.build-unzip-dist: | $(OBJDIR)
 	$(info :: Building unzip )
-	cd subprojects/unzip && \
+	rsync -arx --delete subprojects/unzip $(OBJDIR)
+	cd $(OBJDIR)/unzip && \
 	$(foreach pch, $(UNZIP_PATCHES),patch -Np1 -i debian/patches/$(pch) &&) \
-	make -f unix/Makefile prefix=/usr D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 LF2="$(LDFLAGS)" CF="$(CFLAGS) -I. $(DEFINES)" unzips
+	make -f unix/Makefile prefix=$(BASEDIR) D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 LF2="$(LDFLAGS)" CF="$(CFLAGS) -I. $(DEFINES)" unzips
 	touch $(@)
 
 .PHONY: unzip-dist
@@ -103,21 +117,20 @@ unzip-dist: $(OBJDIR)/.build-unzip-dist
 
 unzip-install: unzip-dist
 	$(info :: Installing unzip )
-	cd subprojects/unzip && \
-	make -f unix/Makefile prefix=$(INSTALL_DIR) install
+	cd $(OBJDIR)/unzip && \
+	make -f unix/Makefile prefix=$(TARGET_DIR)$(BASEDIR) install
 	# Post install
-	cp -a $(INSTALL_DIR)/bin/unzip $(INSTALL_DIR)
-	rm -r $(INSTALL_DIR)/bin $(INSTALL_DIR)/man
+	rm -r $(TARGET_DIR)$(BASEDIR)/man
 
 #
 # python-xlib
 #
 
 $(OBJDIR)/.build-python-xlib-dist: | $(OBJDIR)
 	$(info :: Building python-xlib )
-	cd subprojects/python-xlib && \
-	dpkg-source --before-build . && \
-	dh_auto_build -O--buildsystem=pybuild
+	rsync -arx --delete subprojects/python-xlib $(OBJDIR)
+	cd $(OBJDIR)/python-xlib && \
+	python setup.py build
 	touch $(@)
 
 .PHONY: python-xlib-dist
@@ -126,10 +139,10 @@ python-xlib-dist: $(OBJDIR)/.build-python-xlib-dist
 
 python-xlib-install: python-xlib-dist
 	$(info :: Installing python-xlib )
-	mkdir -p $(INSTALL_DIR)/_vendor && \
-	cd subprojects/python-xlib && \
-	dh_auto_install -O--buildsystem=pybuild && \
-	find debian/tmp -type d -name Xlib | xargs -I {} mv {} $(INSTALL_DIR)/_vendor; \
+	mkdir $(TARGET_DIR)/_vendor
+	cd $(OBJDIR)/python-xlib && mkdir dist && \
+	python setup.py install --root=dist --optimize=1 --skip-build && \
+	find dist -type d -name Xlib | xargs -I {} mv {} $(TARGET_DIR)/_vendor;
 
 $(OBJDIR):
 	@mkdir -p $(@)

__init__.py

@@ -3,6 +3,7 @@
 import os
 import sys
 import traceback
+from typing import Callable
 
 from . import fix
 from .logger import log
@@ -12,6 +13,10 @@
     f'{os.path.dirname(os.path.realpath(__file__))}/_vendor',  # noqa: PTH120
 )
 
+bin_dir: str = f'{os.path.dirname(os.path.realpath(__file__))}/files/bin'
+i386_lib_dir: str = f'{os.path.dirname(os.path.realpath(__file__))}/files/lib/i386-linux-gnu'
+x86_64_lib_dir: str = f'{os.path.dirname(os.path.realpath(__file__))}/files/lib/x86_64-linux-gnu'
+
 
 def check_conditions() -> bool:
     """Determine, if the actual game was executed and protonfixes isn't deactivated.
@@ -38,15 +43,26 @@ def check_iscriptevaluator() -> bool:
     return len(sys.argv) >= 3 and 'iscriptevaluator.exe' in sys.argv[2]
 
 
-if check_iscriptevaluator():
-    log.debug('Skipping fix execution. We are running "iscriptevaluator.exe".')
-elif not check_conditions():
-    log.warn('Skipping fix execution. We are probably running an unit test.')
-else:
-    try:
-        fix.main()
+def setup(env: dict, bin_path_var: str, lib_path_var: str, func: Callable[[dict, str, str, str], None]) -> None:
+    """Setup PATH and LD_LIBRARY_PATH to include protonfixes's binary and library paths"""
+    func(env, bin_path_var, bin_dir, ':')
+    func(env, lib_path_var, f'{x86_64_lib_dir}:{i386_lib_dir}', ':')
+
+
+def execute() -> None:
+    """Execute protonfixes"""
+    if check_iscriptevaluator():
+        log.debug('Skipping fix execution. We are running "iscriptevaluator.exe".')
+    elif not check_conditions():
+        log.warn('Skipping fix execution. We are probably running an unit test.')
+    else:
+        try:
+            fix.main()
+
+        # Catch any exceptions and print a traceback
+        except Exception:
+            sys.stderr.write('ProtonFixes ' + traceback.format_exc())
+            sys.stderr.flush()
+
 
-    # Catch any exceptions and print a traceback
-    except Exception:
-        sys.stderr.write('ProtonFixes ' + traceback.format_exc())
-        sys.stderr.flush()
+__all__ = ["setup", "execute"]

util.py

@@ -321,7 +321,7 @@ def protontricks(verb: str) -> bool:
         env['WINETRICKS_LATEST_VERSION_CHECK'] = 'disabled'
         env['LD_PRELOAD'] = ''
 
-        winetricks_bin = os.path.abspath(__file__).replace('util.py', 'winetricks')
+        winetricks_bin = 'winetricks'
         winetricks_cmd = [winetricks_bin, '--unattended'] + verb.split(' ')
         if verb == 'gui':
             winetricks_cmd = [winetricks_bin, '--unattended']