Skip to content

Commit

Permalink
rename start.pl to isotovideo
Browse files Browse the repository at this point in the history
now that the video is encoded live, we don't need the isotovideo wrapper
anymore. As isotovideo is the nicer name than start.pl, I just renamed it
  • Loading branch information
coolo committed Nov 27, 2014
1 parent 199fd00 commit 8a11395
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 63 deletions.
11 changes: 6 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@ pkglibexec_SCRIPTS = \
ocr.pm \
cv.pm \
needle.pm \
crop.py \
start.pl
crop.py

bin_SCRIPTS = isotovideo

install-exec-hook:
sed -i -e "s,my \$$installprefix.*,my \$$installprefix = '$(pkglibexecdir)';," $(DESTDIR)$(bindir)/isotovideo

pkglibexec_FOLDERS = \
distri \
Expand All @@ -51,8 +55,6 @@ pkglibexec_FOLDERS = \

# sort the above out so it is not done directory wise

bin_SCRIPTS = bin/isotovideo

pkglibexec_PROGRAMS = videoencoder

videoencoder_SOURCES = videoencoder.cpp
Expand All @@ -61,7 +63,6 @@ videoencoder_LDADD = $(OPENCV_LIBS) $(THEORAENC_LIBS) -lm

EXTRA_DIST = \
autogen.sh \
bin/isotovideo.in \
ppmclibs/tinycv.i \
$(backendhelpexec_SCRIPTS) $(backendexec_SCRIPTS) \
$(doc_DATA) $(pkglibexec_DATA) $(pkglibexec_SCRIPTS) $(packagestate_DATA_FOLDERS) $(pkglibexec_FOLDERS)
Expand Down
2 changes: 1 addition & 1 deletion README.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ used by the tests. A minimal vars.json file can be:

Now we can launch the application with:

$ ../os-autoinst/start.pl
$ ../os-autoinst/isotovideo

and we can use VNC to connect to the QEMU instance:

Expand Down
3 changes: 0 additions & 3 deletions bin/isotovideo.in

This file was deleted.

1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,5 @@ PKG_CHECK_MODULES([THEORAENC], [theoraenc >= 1.1])
AC_CONFIG_FILES([
Makefile
t/Makefile
bin/isotovideo
])
AC_OUTPUT
10 changes: 5 additions & 5 deletions doc/needles.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Some packages are required to run crop.py. So for the first time do:
zypper in python-imaging python-tk

To create needles or to adjust test cases the easiest way is to run start.pl
To create needles or to adjust test cases the easiest way is to run isotovideo
interactively. Parameters for the installation are stored in environment
variables. You want to run start.pl in some empty directory with enough free
variables. You want to run isotovideo in some empty directory with enough free
space left. Disk images, screenshots etc will be created relative to
the directory start.pl is called from.
the directory isotovideo is called from.

Most important environment variables:
- DISTRI: specifies which subdirectory of 'distri' should be used
Expand All @@ -26,10 +26,10 @@ For development/debugging you also want
regions of the needle to the new resolution.


Example how to run start.pl:
Example how to run isotovideo:
$ mkdir /space/openqa
$ cd /space/openqa/
$ DISTRI=opensuse ISO=/path/to/dvd.iso DESKTOP=gnome interactive_crop=1 scaledhack=1 /path/to/start.pl
$ DISTRI=opensuse ISO=/path/to/dvd.iso DESKTOP=gnome interactive_crop=1 scaledhack=1 /path/to/isotovideo

crop.py can be used to interactively edit needles. It takes a json
file or a png as argument.
Expand Down
6 changes: 5 additions & 1 deletion start.pl → isotovideo
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
use threads;

BEGIN {
# the following line is modified during make install
my $installprefix = undef;

my ($wd) = $0 =~ m-(.*)/-;
$wd ||= '.';
unshift @INC, "$wd";
$installprefix ||= $wd;
unshift @INC, "$installprefix";
}

use bmwqemu qw(diag);
Expand Down
45 changes: 0 additions & 45 deletions tools/isotovideo

This file was deleted.

2 changes: 0 additions & 2 deletions tools/precommitcheck

This file was deleted.

0 comments on commit 8a11395

Please sign in to comment.