Fix indent (use 4 spaces) and add modelines and remove trailing whitespace

svn path=/trunk/; revision=54611
This commit is contained in:
Alexis La Goutte 2014-01-05 18:39:58 +00:00
parent 2108ccad09
commit 6c66f368df
1 changed files with 67 additions and 54 deletions

View File

@ -11,92 +11,105 @@ print q{
include ../../../config.nmake
include <win32.mak>
FILES = Files
APP = App
WIRESHARK = Wireshark
FILES = Files
APP = App
WIRESHARK = Wireshark
TOPDIR = ..\..\..
TOPDIR = ..\..\..
STAGING_DIR = $(TOPDIR)\$(INSTALL_DIR)
COPY = xcopy
MOVE = mv
MKDIR = mkdir
COPY_FLAGS = /d /y
COPY = xcopy
MOVE = mv
MKDIR = mkdir
COPY_FLAGS = /d /y
PROGRAM_NAME_PATH_GTK = $(PROGRAM_NAME).exe
# XXX This should be defined in config.nmake.
!IF EXIST("$(TOPDIR)\wireshark-qt-release\qtshark.exe")
QT_DIR = "$(TOPDIR)\wireshark-qt-release"
QT_DIR= "$(TOPDIR)\wireshark-qt-release"
PROGRAM_NAME_PATH_QT = "qtshark.exe"
!ENDIF
!IF EXIST("$(TOPDIR)\wireshark-qt-release\Qt5Core.dll")
NEED_QT5_DLL = USE
NEED_QT5_DLL= USE
!ENDIF
!IF EXIST("$(TOPDIR)\wireshark-qt-release\QtCore4.dll")
NEED_QT4_DLL = USE
NEED_QT4_DLL= USE
!ENDIF
distribution:
};
while($line = <>) {
if($line =~ /^\#/) { # comment
next;
next;
} elsif($line =~ /^\[(\S+)/) { # new directory
if(defined $define) { # Clear out any leftover defines.
print "!ENDIF\n";
undef($define);
}
if(defined $define) { # Clear out any leftover defines.
print "!ENDIF\n";
undef($define);
}
$dir = $1;
$dir = $1;
$dir =~ s/\$INSTDIR?//; # remove $INSTDIR
$dir =~ s/\{/\(/g; $dir =~ s/\}/\)/g; # convert curlies to round brackets
$dir =~ s/\$INSTDIR?//; # remove $INSTDIR
$dir =~ s/\{/\(/g; $dir =~ s/\}/\)/g; # convert curlies to round brackets
if($dir ne '') {
print " if not exist \$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir \$(MKDIR) \$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir\n";
}
if($dir ne '') {
print "\tif not exist \$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir \$(MKDIR) \$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir\n";
}
} else { # this is a file
$line =~ /^\s+(\S+)/;
$file = $1;
$line =~ /^\s+(\S+)/;
$file = $1;
$file =~ s/\{/\(/g; $file =~ s/\}/\)/g; # convert curlies to round brackets
$file =~ s/\{/\(/g; $file =~ s/\}/\)/g; # convert curlies to round brackets
if($file =~ /^[^\$]/) {
$file = "\$(TOPDIR)\\" . $file;
}
if($file =~ /^[^\$]/) {
$file = "\$(TOPDIR)\\" . $file;
}
if($line =~ /ifdef=(\w+)/) { # dependency
if($define ne $1) {
if(defined $define) {
print "!ENDIF\n";
}
$define = $1;
print "!IF DEFINED($define)\n";
}
} else {
if(defined $define) {
print "!ENDIF\n";
}
undef $define;
}
if($line =~ /ifdef=(\w+)/) { # dependency
if($define ne $1) {
if(defined $define) {
print "!ENDIF\n";
}
$define = $1;
print "!IF DEFINED($define)\n";
}
} else {
$oname = "";
if(defined $define) {
print "!ENDIF\n";
}
undef $define;
}
print "\t\$(COPY) \"$file\" \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir\" \$(COPY_FLAGS)\n";
$oname = "";
if($line =~ /oname=(\S+)/) { # override this filename
$oname = $1;
$file =~ /\\(.*)$/;
$name = $1;
print " \$(COPY) \"$file\" \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)$dir\" \$(COPY_FLAGS)\n";
print "\t\$(MOVE) \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$name\" \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$oname\"\n";
if($line =~ /oname=(\S+)/) { # override this filename
$oname = $1;
$file =~ /\\(.*)$/;
$name = $1;
}
print " \$(MOVE) \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$name\" \"\$(FILES)\\\$(APP)\\\$(WIRESHARK)\\$dir\\$oname\"\n";
}
}
}
#
# Editor modelines
#
# Local Variables:
# c-basic-offset: 4
# tab-width: 8
# indent-tabs-mode: nil
# End:
#
# ex: set shiftwidth=4 tabstop=8 expandtab:
# :indentSize=4:tabSize=8:noTabs=true:
#