diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x[-rw-r--r--] | bin/createpackage.bat | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/createpackage.pl | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/patch_capabilities.pl | 4 | ||||
| -rwxr-xr-x | bin/syncqt | 12 |
4 files changed, 14 insertions, 8 deletions
diff --git a/bin/createpackage.bat b/bin/createpackage.bat index 7381888..7381888 100644..100755 --- a/bin/createpackage.bat +++ b/bin/createpackage.bat diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 4597b04..7e87758 100644..100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -146,9 +146,9 @@ my $signed_sis_name = $pkgoutputbasename.".sis"; my $scriptpath = dirname(__FILE__); my $certtext = $certificate; my $certpath = $scriptpath; -$certpath =~ s-^(.*[^\\])$-$1\\-o; # ensure path ends with a backslash -$certpath = $certpath."../"; # certificates are one step up in hierarcy -$certpath =~ s-/-\\-go; # for those working with UNIX shells +$certpath =~ s-^(.*[^\\])$-$1\\-o; # ensure path ends with a backslash +$certpath =~ s-/-\\-go; # for those working with UNIX shells +$certpath =~ s-bin\\$-src\\s60installs\\-; # certificates are one step up in hierarcy # Check some pre-conditions and print error messages if needed unless (length($templatepkg) && length($platform) && length($target)) { diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl index 2fcf703..bfd34f0 100644..100755 --- a/bin/patch_capabilities.pl +++ b/bin/patch_capabilities.pl @@ -51,8 +51,8 @@ sub Usage() { print("specified for deployment in a .pkg file.\n"); print("If no capabilities are given, the binaries will be given the\n"); print("capabilities supported by self-signed certificates.\n"); - print("\nUsage: patch_capabilities.pl pkg_filename [target-platform] [capability list]\n"); - print(" If template .pkg file is given, next agrument must be 'target-platform'.\n"); + print("\n *** NOTE: If *_template.pkg file is given, 'target-platform' is REQUIRED. ***\n"); + print("\nUsage: patch_capabilities.pl pkg_filename <target-platform> [capability list]\n"); print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv5 \"All -TCB\"\n"); exit(); } @@ -530,7 +530,7 @@ sub findFiles { } else { ($dir =~ /\/$/) || ($dir .= "/"); } - foreach $file ( readdir(D) ) { + foreach $file ( sort readdir(D) ) { next if ( $file =~ /^\.\.?$/ ); $p = $file; ($file =~ /$match/) && (push @files, $p); @@ -845,9 +845,15 @@ foreach (@modules_to_sync) { $master_contents .= "#endif\n"; unless($showonly) { - unless ($lib eq "phonon") { + my @master_includes; + if ($lib eq "phonon") { + push @master_includes, "$out_basedir/include/phonon_compat/phonon/phonon"; + push @master_includes, "$out_basedir/include/phonon/Phonon/Phonon"; + } else { + push @master_includes, "$out_basedir/include/$lib/$lib"; + } + foreach my $master_include (@master_includes) { #generate the "master" include file - my $master_include = "$out_basedir/include/$lib/$lib"; $pri_install_files .= fixPaths($master_include, "$modules{$lib}") . " "; #get the master file installed too if($master_include && -e "$master_include") { open MASTERINCLUDE, "<$master_include"; |