[Scummvm-git-logs] scummvm master -> a8a9703fa7c55c31bee777b8188f241ebb670342

sev- noreply at scummvm.org
Thu May 9 13:20:46 UTC 2024 

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4b0c29e5db AMIGAOS: Rename Ext_Inst_so.rexx to install_deps.rexx
a8a9703fa7 AMIGAOS: Update install_deps.rexx


Commit: 4b0c29e5db21fbe6e6997b255b7d0fe0755112f5
    https://github.com/scummvm/scummvm/commit/4b0c29e5db21fbe6e6997b255b7d0fe0755112f5
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-05-09T15:20:43+02:00

Commit Message:
AMIGAOS: Rename Ext_Inst_so.rexx to install_deps.rexx

Changed paths:
  A dists/amigaos/install_deps.rexx
  R dists/amigaos/Ext_Inst_so.rexx
    backends/platform/sdl/amigaos/amigaos.mk


diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk
index b03763fab3b..ea8f70e2faa 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -62,9 +62,9 @@ endif
 	# AmigaOS installations, especially vanilla ones, won't have every
 	# mandatory shared library in place, let alone the correct versions.
 	# Extract and install compiled-in shared libraries to their own subdir.
-	$(CP) ${srcdir}/dists/amigaos/Ext_Inst_so.rexx .
-	rx Ext_Inst_so.rexx $(EXECUTABLE) $(AMIGAOSPATH)
-	rm -f Ext_Inst_so.rexx
+	$(CP) ${srcdir}/dists/amigaos/install_deps.rexx .
+	rx install_deps.rexx $(EXECUTABLE) $(AMIGAOSPATH)
+	rm -f install_deps.rexx
 endif
 ifdef DEBUG_BUILD
 	# Preserve all debug information on debug builds
diff --git a/dists/amigaos/Ext_Inst_so.rexx b/dists/amigaos/install_deps.rexx
similarity index 100%
rename from dists/amigaos/Ext_Inst_so.rexx
rename to dists/amigaos/install_deps.rexx


Commit: a8a9703fa7c55c31bee777b8188f241ebb670342
    https://github.com/scummvm/scummvm/commit/a8a9703fa7c55c31bee777b8188f241ebb670342
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-05-09T15:20:43+02:00

Commit Message:
AMIGAOS: Update install_deps.rexx

Changed paths:
    dists/amigaos/install_deps.rexx


diff --git a/dists/amigaos/install_deps.rexx b/dists/amigaos/install_deps.rexx
index 93d3e0658f3..bbe7a6c525e 100644
--- a/dists/amigaos/install_deps.rexx
+++ b/dists/amigaos/install_deps.rexx
@@ -1,8 +1,10 @@
 /*
-$VER: Ext_Inst_so.rexx 0.5 (05.12.2020) Extract and install compiled-in shared libraries from a given ELF binary.
+$VER: install_deps.rexx 0.6 (28.04.2024) Install dependant shared libraries
+
+Extracts and installs .so libraries, the main binary depends on, to it's own sobjs/ dir
 */
 
-PARSE ARG executable install_path
+PARSE ARG argBinary argPath
 
 /*
 Determine REXX interpreter
@@ -10,80 +12,84 @@ Determine REXX interpreter
 PARSE UPPER VERSION language .
 
 /*
-Check if arguments are available, otherwise quit.
+Check if arguments are available, otherwise quit
 */
 IF ~ARG() THEN DO
 	SAY 'No Arguments given!'
-	SAY 'Usage: Ext_Inst_so.rexx EXECUTABLE INSTALL_PATH'
+	SAY 'Usage: Install_deps.rexx argBinary argPath'
 	EXIT
 END
 
 /*
 If the given filename/path has spaces in it, AmigaDOS/CLI will add extra
-quotation marks to secure a sane working path.
-Get rid of them to make AREXX find the file and remove leading and trailing
-spaces.
+quotation marks to secure a sane working path
+Get rid of those to make AREXX find the file and remove leading and trailing spaces
 */
-IF ~EXISTS(executable) THEN DO
-	SAY executable' not available!'
+IF ~EXISTS(argBinary) THEN DO
+	SAY argBinary' not available!'
 	EXIT
 END
 ELSE DO
-	executable=STRIP(executable)
-	executable=COMPRESS(executable,'"')
+	argBinary=STRIP(argBinary)
+	argBinary=COMPRESS(argBinary,'"')
 END
-IF installpath='' THEN DO
-	SAY 'No installation destination given!'
+IF installpath = '' THEN DO
+	SAY 'No installation destination/path given!'
 	EXIT
 END
 ELSE DO
-	install_path=STRIP(install_path)
-	install_path=STRIP(install_path,'T','/')
-	install_path=COMPRESS(install_path,'"')
+	argPath=STRIP(argPath)
+	argPath=STRIP(argPath,'T','/')
+	argPath=COMPRESS(argPath,'"')
 	/*
-	Check for destination path and create it, if needed.
+	Check for destination path and create it, if needed
 	*/
-	IF ~EXISTS(install_path'/sobjs/') THEN
-		ADDRESS COMMAND 'makedir all 'install_path'/sobjs'
+	IF ~EXISTS(argPath'/sobjs/') THEN
+		ADDRESS COMMAND 'makedir all 'argPath'/sobjs'
 END
 
 /*
-Save used gcc version. Needed later to install libgcc.so.
+Save used gcc version, which is needed later on to install the correct libgcc.so version
 */
 ADDRESS COMMAND 'gcc -dumpversion >so_dump'
 
 /*
-Create shared objects dump.
+Create shared objects dump
 */
-ADDRESS COMMAND 'readelf -d 'executable' >>so_dump'
+ADDRESS COMMAND 'readelf -d 'argBinary' >>so_dump'
 
 /*
-Error check, if I/O went wrong.
+Error check, if I/O went wrong
 */
-IF ~OPEN(SO_read,'so_dump','R') THEN DO
+IF ~OPEN(fileLiblist,'so_dump','R') THEN DO
 	SAY 'File so_dump opening failed!'
 	EXIT
 END
 
 /*
-Get used gcc version.
+Get used gcc version
 */
-gcc_version=READLN(SO_read)
+gcc_version=READLN(fileLiblist)
 
 /*
-We know that the dumped shared library entries always start at line 4 (line 5
-now with the added gcc version). Skip unneeded lines to speed up processing.
+We know that the dumped shared library entries always start at line 4 (line 5 now with
+added gcc version)
+Skip unneeded lines to speed up processing
 */
-working_line=CALL READLN(SO_read)
-working_line=CALL READLN(SO_read)
-working_line=CALL READLN(SO_read)
+lineRead=CALL READLN(fileLiblist)
+lineRead=CALL READLN(fileLiblist)
+lineRead=CALL READLN(fileLiblist)
 
 i=1
-libpaths.i = 'SDK:local/newlib/lib/'
+libPaths.i = 'SDK:local/newlib/lib/'
+i=i+1
+libPaths.i = 'SDK:newlib/lib/'
 i=i+1
-libpaths.i = 'SDK:gcc/lib/'
+libPaths.i = 'SDK:gcc/lib/'
 i=i+1
-libpaths.i = 'SDK:gcc/lib/gcc/ppc-amigaos/'gcc_version'/'
+libPaths.i = 'SDK:gcc/lib/gcc/ppc-amigaos/'gcc_version'/'
+i=i+1
+libPaths.i = 'SOBJS:'
 i=i+1
 
 /*
@@ -92,46 +98,46 @@ VALUE(arg,, 'ENVIRONMENT') is a Regina REXX extension
 IF POS('REGINA', language) ~= 0 THEN DO
 	prefix = VALUE('PREFIX',, 'ENVIRONMENT')
 	IF prefix <> '' THEN DO
-		libpaths.i = prefix'/lib/'
+		libPaths.i = prefix'/lib/'
 		i=i+1
 	END
 	prefix = VALUE('CROSS_PREFIX',, 'ENVIRONMENT')
 	IF prefix ~= '' THEN DO
-		libpaths.i = prefix'/lib/gcc/ppc-amigaos/'gcc_version'/'
+		libPaths.i = prefix'/lib/gcc/ppc-amigaos/'gcc_version'/'
 		i=i+1
-		libpaths.i = prefix'/ppc-amigaos/lib/'
+		libPaths.i = prefix'/ppc-amigaos/lib/'
 		i=i+1
 	END
 END
-libpaths.0 = i - 1
+libPaths.0 = i - 1
 
 i=1
 DO WHILE i>0
-	working_line=READLN(SO_read)
-	IF POS('Shared library:', working_line)>0 THEN DO
+	lineRead=READLN(fileLiblist)
+	IF POS('Shared library:', lineRead) > 0 THEN DO
 		i=1
 		/*
-		We know that the shared library names always start at position 59.
+		We know that the shared library names always start at position 59
 		*/
-		lib.so=SUBSTR(working_line,59,LASTPOS(']', working_line)-59)
+		lineLib=SUBSTR(lineRead,59,LASTPOS(']', lineRead)-59)
+
 		/*
-		- Find and install the mandatory shared libraries from their varying
-		  home directories.
-		- libgcc.so is deeply hidden inside the gcc install directory tree
-		  by default. Since people can use different gcc versions we have
-		  determine which to use the correct path.
+		- Find and install the dependant shared libraries from their varying home dirs
+		- libgcc.so is deeply hidden inside the gcc install directory tree by default
+		  Since people can use different gcc versions we have to determine which to use
+		  the correct path
 		*/
-		DO j = 1 TO libpaths.0
-			IF EXISTS(libpaths.j''lib.so) THEN DO
-				ADDRESS COMMAND 'copy clone quiet' libpaths.j''lib.so install_path'/sobjs/'
+		DO j = 1 TO libPaths.0
+			IF EXISTS(libPaths.j''lineLib) THEN DO
+				ADDRESS COMMAND 'copy clone quiet' libPaths.j''lineLib argPath'/sobjs/'
 				LEAVE
 			END
 		END
-		IF j > libpaths.0 THEN DO
+		IF j > libPaths.0 THEN DO
 			/*
-			If a shared library is not found, abort.
+			If no shared library is found, abort
 			*/
-			SAY lib.so' not found! Aborting!'
+			SAY lineLib' not found! Aborting!'
 			EXIT
 		END
 	END
@@ -140,10 +146,10 @@ DO WHILE i>0
 END
 
 /*
-AREXX is doing its own cleaning up of open files.
-Close the file manually anyway.
+AREXX is doing its own cleaning of open files
+Closing the file anyway
 */
-IF ~CLOSE(SO_Read) THEN DO
+IF ~CLOSE(fileLiblist) THEN DO
 	SAY 'File so_dump closing failed!'
 	EXIT
 END

More information about the Scummvm-git-logs mailing list