[Box Backup-dev] COMMIT r868 - box/chris/merge/infrastructure
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Thu Aug 31 22:55:11 BST 2006
Author: chris
Date: 2006-08-31 22:55:11 +0100 (Thu, 31 Aug 2006)
New Revision: 868
Modified:
box/chris/merge/infrastructure/BoxPlatform.pm.in
Log:
* infrastructure/BoxPlatform.pm.in
- Revert to trunk
Modified: box/chris/merge/infrastructure/BoxPlatform.pm.in
===================================================================
--- box/chris/merge/infrastructure/BoxPlatform.pm.in 2006-08-31 21:53:19 UTC (rev 867)
+++ box/chris/merge/infrastructure/BoxPlatform.pm.in 2006-08-31 21:55:11 UTC (rev 868)
@@ -1,27 +1,15 @@
package BoxPlatform;
use Exporter;
@ISA = qw/Exporter/;
- at EXPORT = qw/$build_os $target_os $make_command $bsd_make $platform_define $platform_cpu $gcc_v3 $product_version $product_name $install_into_dir $sub_make_options $platform_compile_line_extra $platform_link_line_extra $platform_lib_files $platform_exe_ext $target_windows/;
+ at EXPORT = qw/$build_os $target_os $make_command $bsd_make $platform_define $platform_cpu $gcc_v3 $product_version $product_name $install_into_dir $sub_make_options $platform_compile_line_extra $platform_link_line_extra $platform_lib_files $platform_exe_ext/;
BEGIN
{
# which OS are we building under?
- $target_os = '@target_os@';
- $target_windows = 0;
- $target_windows = 1 if $target_os =~ m'^mingw32'
- or $target_os eq "winnt";
+ $build_os = `uname`;
+ chomp $build_os;
- if ($^O eq "MSWin32" and not -x "/usr/bin/uname")
- {
- $build_os = "winnt";
- }
- else
- {
- $build_os = `uname`;
- chomp $build_os;
- }
-
# Cygwin Builds usually something like CYGWIN_NT-5.0, CYGWIN_NT-5.1
# Box Backup tried on Win2000,XP only :)
$build_os = 'CYGWIN' if $build_os =~ m/CYGWIN/;
@@ -34,18 +22,11 @@
$platform_compile_line_extra =~ s/ -O2//;
$platform_link_line_extra = '@LDFLAGS@';
$platform_lib_files = '@LIBS@';
+ $target_os = '@target_os@';
$platform_exe_ext = '@EXEEXT@';
# get version
- if (! -r "VERSION.txt" and -r "../../VERSION.txt")
- {
- open VERSION,"../../VERSION.txt" or die "../../VERSION.txt: $!";
- }
- else
- {
- open VERSION,"VERSION.txt" or die "VERSION.txt: $!";
- }
-
+ open VERSION,"VERSION.txt" or die "VERSION.txt: $!";
$product_version = <VERSION>;
chomp $product_version;
$product_name = <VERSION>;
More information about the Boxbackup-dev
mailing list