Skip to content

Commit

Permalink
Fixes path issue to mvm script for building third-party libs for Phar…
Browse files Browse the repository at this point in the history
…o on Linux
  • Loading branch information
marceltaeumel committed Aug 24, 2021
1 parent 252a015 commit af91d2c
Show file tree
Hide file tree
Showing 23 changed files with 61 additions and 61 deletions.
6 changes: 3 additions & 3 deletions building/linux32ARMv6/pharo.cog.spur/build/mvm
Expand Up @@ -25,14 +25,14 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac
test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../$EXTERNALPLUGINS && cp -p ../plugins.ext ./plugins.ext || cp -p ../../$EXTERNALPLUGINS ./plugins.ext)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure \
Expand All @@ -53,6 +53,6 @@ make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
Expand Up @@ -28,14 +28,14 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac
test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
Expand All @@ -49,6 +49,6 @@ rm -rf ../../../../products/$INSTALLDIR
# but older linux readlinks lack the -f flag
make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
6 changes: 3 additions & 3 deletions building/linux32x86/pharo.cog.spur.lowcode/build/mvm
Expand Up @@ -27,15 +27,15 @@ n|no|N|NO) echo "ok but this isn't safe!!";;
*)
test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure \
Expand All @@ -50,6 +50,6 @@ rm -rf ../../../../products/$INSTALLDIR
# but older linux readlinks lack the -f flag
make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
Expand Up @@ -24,12 +24,12 @@ n|no|N|NO) echo "ok but this isn't safe!!";;
*)
test -f Makefile && make clean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

LDFLAGS="-L../../../../.thirdparty-cache/linux/i386/lib" \
Expand All @@ -45,7 +45,7 @@ make
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
cp dist/* $productDir
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
Expand Up @@ -26,14 +26,14 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac
test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
Expand All @@ -52,6 +52,6 @@ make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INS
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
6 changes: 3 additions & 3 deletions building/linux32x86/pharo.cog.spur.minheadless/build/mvm
Expand Up @@ -25,12 +25,12 @@ n|no|N|NO) echo "ok but this isn't safe!!";;
*)
test -f Makefile && make clean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

LDFLAGS="-L../../../../.thirdparty-cache/linux/i386/lib" \
Expand All @@ -48,7 +48,7 @@ rm -rf "$productDir"
mkdir "$productDir"
productDir=`(cd "$productDir";pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
cp dist/* $productDir
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
6 changes: 3 additions & 3 deletions building/linux32x86/pharo.cog.spur/build.itimerheartbeat/mvm
Expand Up @@ -27,14 +27,14 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac
test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
Expand All @@ -51,6 +51,6 @@ make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INS
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
6 changes: 3 additions & 3 deletions building/linux32x86/pharo.cog.spur/build/mvm
Expand Up @@ -27,15 +27,15 @@ n|no|N|NO) echo "ok but this isn't safe!!";;
*)
test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure \
Expand All @@ -53,6 +53,6 @@ make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INS
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
Expand Up @@ -41,6 +41,6 @@ make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INS
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
2 changes: 1 addition & 1 deletion building/linux32x86/pharo.sista.spur/build.assert/mvm
Expand Up @@ -41,6 +41,6 @@ make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INS
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
Expand Up @@ -22,7 +22,7 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

Expand All @@ -44,6 +44,6 @@ make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INS
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
4 changes: 2 additions & 2 deletions building/linux32x86/pharo.sista.spur/build.debug/mvm
Expand Up @@ -22,7 +22,7 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

Expand All @@ -44,6 +44,6 @@ make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INS
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
Expand Up @@ -23,7 +23,7 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

Expand All @@ -45,6 +45,6 @@ make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INS
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
4 changes: 2 additions & 2 deletions building/linux32x86/pharo.sista.spur/build/mvm
Expand Up @@ -23,7 +23,7 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

Expand All @@ -46,6 +46,6 @@ make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INS
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
Expand Up @@ -27,14 +27,14 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac
test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
Expand All @@ -48,6 +48,6 @@ rm -rf ../../../../products/$INSTALLDIR
# but older linux readlinks lack the -f flag
make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
6 changes: 3 additions & 3 deletions building/linux32x86/pharo.stack.spur.lowcode/build/mvm
Expand Up @@ -27,15 +27,15 @@ n|no|N|NO) echo "ok but this isn't safe!!";;
*)
test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure \
Expand All @@ -50,6 +50,6 @@ rm -rf ../../../../products/$INSTALLDIR
# but older linux readlinks lack the -f flag
make install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ; test ${PIPESTATUS[0]} -eq 0
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
../../third-party/mvm ${lib} install `find ../../../../products/$INSTALLDIR -name "5.0*"`
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
6 changes: 3 additions & 3 deletions building/linux64ARMv8/pharo.stack.spur/build/mvm
Expand Up @@ -25,14 +25,14 @@ case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) test -f Makefile && make reallyclean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac
test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
test -f plugins.ext || (test -f ../$EXTERNALPLUGINS && cp -p ../plugins.ext ./plugins.ext || cp -p ../../$EXTERNALPLUGINS ./plugins.ext)

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

test -f config.h || ../../../../platforms/unix/config/configure \
Expand All @@ -52,6 +52,6 @@ make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"
Expand Up @@ -15,12 +15,12 @@ n|no|N|NO) echo "ok but this isn't safe!!";;
*)
test -f Makefile && make clean
# for lib in ${THIRDPARTYLIBS}; do
# ../../../third-party/mvm ${lib} clean
# ../../third-party/mvm ${lib} clean
# done
esac

for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib}
../../third-party/mvm ${lib}
done

LDFLAGS="-L../../../../.thirdparty-cache/linux/x86_64/lib" \
Expand All @@ -37,7 +37,7 @@ make
productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
../../../third-party/mvm ${lib} install $productDir
../../third-party/mvm ${lib} install $productDir
done
cp dist/* $productDir
../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"

0 comments on commit af91d2c

Please sign in to comment.