SL-18837: Fix Windows cp commands per actions branch.

secondlife · May 13, 2023 · 91ae6ee · 91ae6ee
1 parent b3f4b45
commit 91ae6ee
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/build-cmd.sh b/build-cmd.sh
@@ -145,24 +145,10 @@ case "$AUTOBUILD_PLATFORM" in
 
     mkdir -p "$RELEASE_OUT_DIR" || echo "$RELEASE_OUT_DIR exists"
 
-    if [ "$AUTOBUILD_ADDRSIZE" = 32 ]
-      then 
-        bitdir=""
-      else
-        bitdir="/x64"
-    fi
-    cp "apr$bitdir/LibR/apr-1."{lib,pdb} "$RELEASE_OUT_DIR"
-    cp "apr-util$bitdir/LibR/aprutil-1."{lib,pdb} "$RELEASE_OUT_DIR"
-    cp "apr-iconv$bitdir/LibR/apriconv-1."{lib,pdb} "$RELEASE_OUT_DIR"
-    cp "apr$bitdir/Release/libapr-1."{lib,dll} "$RELEASE_OUT_DIR"
-    cp "apr$bitdir/Release/libapr.pdb" "$RELEASE_OUT_DIR"
-    cp "apr$bitdir/Release/libapr_src.pdb" "$RELEASE_OUT_DIR"
-    cp "apr-iconv$bitdir/Release/libapriconv-1."{lib,dll} "$RELEASE_OUT_DIR"
-    cp "apr-iconv$bitdir/Release/libapriconv.pdb" "$RELEASE_OUT_DIR"
-    cp "apr-iconv$bitdir/Release/libapriconv_src.pdb" "$RELEASE_OUT_DIR"
-    cp "apr-util$bitdir/Release/libaprutil-1."{lib,dll} "$RELEASE_OUT_DIR"
-    cp "apr-util$bitdir/Release/libaprutil.pdb" "$RELEASE_OUT_DIR"
-    cp "apr-util$bitdir/Release/libaprutil_src.pdb" "$RELEASE_OUT_DIR"
+    cp -v "$APR_RELEASE_DIR"/{apr-1.{lib,pdb},libapr-1.{lib,dll}} "$RELEASE_OUT_DIR"
+    cp -v "$APR_UTIL_RELEASE_DIR"/{aprutil-1.{lib,pdb},libaprutil-1.{lib,dll}} "$RELEASE_OUT_DIR"
+##  cp "apr-iconv$bitdir/LibR"/apriconv-1.{lib,pdb} "$RELEASE_OUT_DIR"
+##  cp "apr-iconv$bitdir/Release/libapriconv-1."{lib,dll} "$RELEASE_OUT_DIR"
 
     INCLUDE_DIR="$STAGING_DIR/include/apr-1"
     mkdir -p "$INCLUDE_DIR"      || echo "$INCLUDE_DIR exists"