[Libreoffice-commits] dev-tools.git: bibisect/buildWinReleasesRepository.sh

[Xisco Fauli (via logerrit)]

 bibisect/buildWinReleasesRepository.sh |   48 +++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 19 deletions(-)

New commits:
commit 629208e0a83bed8a62f9391c6d288bda19c4f860
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Mar 30 19:51:48 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Mar 30 19:52:57 2023 +0200

    Adapt code for 5.x releases
    
    Change-Id: I1184c0ca46231f28e8fa8fd68df5640cd266e38d

diff --git a/bibisect/buildWinReleasesRepository.sh 
b/bibisect/buildWinReleasesRepository.sh
index 301f560a..97a4856c 100755
--- a/bibisect/buildWinReleasesRepository.sh
+++ b/bibisect/buildWinReleasesRepository.sh
@@ -89,32 +89,38 @@ do
     echo "*** Moving files to instdir folder"
     mv $rootDir/output/Program\ Files/* $rootDir/instdir
 
-    echo "*** Moving files to program"
-    if [[ ! -d $rootDir/instdir/URE/bin/ ]]; then
-        echo "$rootDir/instdir/URE/bin/ doesn't exists"
-        removeOriginFolders
-        break
-    fi
-    mv $rootDir/instdir/URE/bin/*.dll $rootDir/instdir/program/
+    if [[ $input = "3."* || $input = "4."* ]]; then
+        echo "*** Moving files to program"
+        if [[ ! -d $rootDir/instdir/URE/bin/ ]]; then
+            echo "$rootDir/instdir/URE/bin/ doesn't exists"
+            removeOriginFolders
+            break
+        fi
+        mv $rootDir/instdir/URE/bin/*.dll $rootDir/instdir/program/
 
-    if [[ ! -d $rootDir/instdir/URE/misc/ ]]; then
-        echo "$rootDir/instdir/URE/misc/ doesn't exists"
-        removeOriginFolders
-        break
-    fi
-    mv $rootDir/instdir/URE/misc/*.rdb $rootDir/instdir/program/
+        if [[ ! -d $rootDir/instdir/URE/misc/ ]]; then
+            echo "$rootDir/instdir/URE/misc/ doesn't exists"
+            removeOriginFolders
+            break
+        fi
+        mv $rootDir/instdir/URE/misc/*.rdb $rootDir/instdir/program/
 
-    # msvcp* and msvcr libraries
-    mv $rootDir/output/Win/System/*.dll $rootDir/instdir/program/
+        # msvcp* and msvcr libraries
+        mv $rootDir/output/Win/System/*.dll $rootDir/instdir/program/
 
-    echo "*** Writing to uno.ini"
-    echo "[Bootstrap]
+        echo "*** Writing to uno.ini"
+        echo "[Bootstrap]
 URE_INTERNAL_LIB_DIR=\${ORIGIN}
 URE_INTERNAL_JAVA_DIR=\${ORIGIN}/classes
 URE_INTERNAL_JAVA_CLASSPATH=\${URE_MORE_JAVA_TYPES}
 UNO_TYPES=\${ORIGIN}/types.rdb \${URE_MORE_TYPES}
 UNO_SERVICES=\${ORIGIN}/services.rdb \${URE_MORE_SERVICES}" >>  
$rootDir/instdir/program/uno.ini
 
+    else
+        # msvcp* and msvcr libraries
+        mv $rootDir/output/System/*.dll $rootDir/instdir/program/
+    fi
+
     echo "*** Changing bootstrap.ini"
     sed -i '/UserInstallation/d' $rootDir/instdir/program/bootstrap.ini
     echo "UserInstallation=\$ORIGIN/.." >> 
$rootDir/instdir/program/bootstrap.ini
@@ -122,6 +128,7 @@ UNO_SERVICES=\${ORIGIN}/services.rdb \${URE_MORE_SERVICES}" 
>>  $rootDir/instdir
     echo "*** Cleaning destination"
     rm -rf ${targetDir}/instdir/
     mkdir ${targetDir}/instdir/
+
     echo "*** Moving files to destination"
     mv $rootDir/instdir/program ${targetDir}/instdir/program
     if [ $isExeFile -eq 1 ]; then
@@ -131,12 +138,15 @@ UNO_SERVICES=\${ORIGIN}/services.rdb 
\${URE_MORE_SERVICES}" >>  $rootDir/instdir
         mv $rootDir/instdir/share ${targetDir}/instdir/share
         mv $rootDir/instdir/presets ${targetDir}/instdir/presets
 
-        # it makes .exe files to work
-        touch ${targetDir}/instdir/ure-link
+        if [[ $input = "3."* || $input = "4."* ]]; then
+            # it makes .exe files to work
+            touch ${targetDir}/instdir/ure-link
+        fi
 
         echo "*** Removing extensions"
         rm -rf ${targetDir}/instdir/share/extensions/
     fi
+
     removeOriginFolders
 
     cd ${targetDir}