From 3512a9fe404bc8727f6756334f5baeec26d42fac Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sun, 11 Aug 2013 18:44:58 +1000 Subject: Remove two scripts no longer used These scripts are too specific to my virtual machine setup, a more generic method can now be used by setting ARDOUR_VM_SHARE_DIR and using the cptovmshare.sh script. --- tools/windows_packaging/cptovm.sh | 62 ------------------------------------ tools/windows_packaging/mingw-env.sh | 3 -- tools/windows_packaging/startvm.sh | 4 --- 3 files changed, 69 deletions(-) delete mode 100755 tools/windows_packaging/cptovm.sh delete mode 100755 tools/windows_packaging/startvm.sh (limited to 'tools') diff --git a/tools/windows_packaging/cptovm.sh b/tools/windows_packaging/cptovm.sh deleted file mode 100755 index 62e6fd6a27..0000000000 --- a/tools/windows_packaging/cptovm.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -. ./mingw-env.sh - -TMP_DIR=tmp -LOOP_DEV=/dev/loop4 - -cd $BASE || exit 1 - -if [ ! -d $TMP_DIR ]; then - echo "Creating temp directory to mount vm image ..." - mkdir $TMP_DIR || exit 1 -fi - -echo "mounting vm image as loopback device ..." - -sudo mount -o loop=$LOOP_DEV,offset=32256 $VIRT_IMAGE_PATH $TMP_DIR || exit 1 - -if [ -d $TMP_DIR/$PACKAGE_DIR ]; then - echo "Removing old copy of $PACKAGE_DIR from vm image ..." - rm -rf $TMP_DIR/$PACKAGE_DIR || exit 1 -fi - -echo "Copying $PACKAGE_DIR to vm image ..." -cp -r $PACKAGE_DIR $TMP_DIR || exit 1 - -if [ "$1" == "--data" ]; then - DATA_DIR=data - - if [ -d $TMP_DIR/$DATA_DIR ]; then - echo "Removing old copy of $DATA_DIR from vm image ..." - rm -rf $TMP_DIR/$DATA_DIR || exit 1 - fi - - echo "Copying $DATA_DIR to vm image ..." - cp -r $DATA_DIR $TMP_DIR || exit 1 -fi - - -# in case mount is busy -sleep 2 - -echo "Unmounting vm image ..." - -sudo umount -d tmp - -echo "Removing temp directory used to mount vm image ..." -rm -rf $TMP_DIR || exit 1 - -if sudo losetup $LOOP_DEV; then - echo "sleeping for 10 seconds and trying again ..." - sleep 10 - if sudo losetup -d $LOOP_DEV; then - echo "Unmounted loopback device successfully" - exit 0 - else: - echo "Unmounting loopback device unsuccessful, you will need to use losetup -d to unmount device" - exit 1 - fi -fi - -exit 0 diff --git a/tools/windows_packaging/mingw-env.sh b/tools/windows_packaging/mingw-env.sh index 616f89af5e..819ea04055 100755 --- a/tools/windows_packaging/mingw-env.sh +++ b/tools/windows_packaging/mingw-env.sh @@ -47,6 +47,3 @@ then ARDOUR_DATA_DIR=$PACKAGE_DIR/share/ardour3 fi - -# put this somewhere better... -VIRT_IMAGE_PATH=$HOME/Data/virt-images/winxp.raw diff --git a/tools/windows_packaging/startvm.sh b/tools/windows_packaging/startvm.sh deleted file mode 100755 index de65be9b5d..0000000000 --- a/tools/windows_packaging/startvm.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -. mingw-env.sh - -qemu-kvm -smp 2 -m 1536 -hda $VIRT_IMAGE_PATH -net nic -net user -vga std -soundhw all -- cgit v1.2.3