Build modifications for Drosera.
authorsfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 8 Dec 2007 04:26:15 +0000 (04:26 +0000)
committersfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 8 Dec 2007 04:26:15 +0000 (04:26 +0000)
        Reviewed by Adam.

        * Drosera/DroseraWin.make: Added.
        * Drosera/win/Drosera.vcproj/Drosera.rc:
        * Drosera/win/Drosera.vcproj/Drosera.vcproj:
        * Drosera/win/Drosera.vcproj/PRODUCTVERSION: Added.
        * Drosera/win/Drosera.vcproj/VERSION: Added.
        * Drosera/win/Drosera.vcproj/auto-version.sh: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28556 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Drosera/DroseraWin.make [new file with mode: 0644]
WebKitTools/Drosera/win/Drosera.vcproj/Drosera.rc
WebKitTools/Drosera/win/Drosera.vcproj/Drosera.vcproj
WebKitTools/Drosera/win/Drosera.vcproj/PRODUCTVERSION [new file with mode: 0644]
WebKitTools/Drosera/win/Drosera.vcproj/VERSION [new file with mode: 0644]
WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh [new file with mode: 0644]

index dee845a601f9469a39202494212dfd20e4120a24..07ee1966db3a0ca9c42e43a9352193d5b9c95caf 100644 (file)
@@ -1,3 +1,16 @@
+2007-12-07  Steve Falkenburg  <sfalken@apple.com>
+
+        Build modifications for Drosera.
+
+        Reviewed by Adam.
+
+        * Drosera/DroseraWin.make: Added.
+        * Drosera/win/Drosera.vcproj/Drosera.rc:
+        * Drosera/win/Drosera.vcproj/Drosera.vcproj:
+        * Drosera/win/Drosera.vcproj/PRODUCTVERSION: Added.
+        * Drosera/win/Drosera.vcproj/VERSION: Added.
+        * Drosera/win/Drosera.vcproj/auto-version.sh: Added.
+
 2007-12-06  Adam Roben  <aroben@apple.com>
 
         Explicitly turn on the Mac font ascent hack on Windows
diff --git a/WebKitTools/Drosera/DroseraWin.make b/WebKitTools/Drosera/DroseraWin.make
new file mode 100644 (file)
index 0000000..7abac7c
--- /dev/null
@@ -0,0 +1,13 @@
+!IF !defined(BUILDSTYLE)
+BUILDSTYLE=Release
+!ELSEIF "$(BUILDSTYLE)"=="DEBUG"
+BUILDSTYLE=Debug_Internal
+!ENDIF
+
+install:
+       set WebKitLibrariesDir="$(SRCROOT)\AppleInternal"
+       set WebKitOutputDir=$(OBJROOT)
+       set PRODUCTION=1
+       devenv "win\Drosera.vcproj\Drosera.vcproj" /rebuild $(BUILDSTYLE)
+       xcopy "$(OBJROOT)\bin\*" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
+       xcopy "$(OBJROOT)\bin\Drosera.resources\*" "$(DSTROOT)\AppleInternal\bin\Drosera.resources" /e/v/i/h/y
index 2e16fa397424db1505a7cf7a3ea57d85a9091eaf..a9b38e77aa91ca9bfe28b0349f5aa3126dd17067 100755 (executable)
@@ -1,6 +1,9 @@
 // Microsoft Visual C++ generated resource script.\r
 //\r
 #include "resource.h"\r
+#ifndef APSTUDIO_INVOKED
+#include "autoversion.h"
+#endif
 \r
 #define APSTUDIO_READONLY_SYMBOLS\r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -127,6 +130,44 @@ END
 #endif    // APSTUDIO_INVOKED\r
 \r
 \r
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __VERSION_MAJOR__,__BUILD_NUMBER_MAJOR__,__BUILD_NUMBER_MINOR__,__BUILD_NUMBER_VARIANT__
+ PRODUCTVERSION __VERSION_MAJOR__,__VERSION_MINOR__,__VERSION_TINY__,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Drosera JavaScript Debugger"
+            VALUE "FileVersion", __VERSION_TEXT__
+            VALUE "CompanyName", "Apple Inc."
+            VALUE "InternalName", "Drosera"
+            VALUE "LegalCopyright", "Copyright Apple Inc. 2006, 2007"
+            VALUE "OriginalFilename", "Drosera.exe"
+            VALUE "ProductName", "Drosera"
+            VALUE "ProductVersion", __VERSION_TEXT__
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // String Table\r
index 31b6bb78566fa73459e616be6a248deea00d527f..194393c9f208b0fd5db7a707698613401ee1beaa 100755 (executable)
@@ -25,7 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine=""\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -65,7 +65,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__APPLICATION_NAME__=\&quot;$(ProjectName)\&quot;"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)\WTL75\include&quot;;&quot;$(IntDir)\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(IntDir)\include&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine=""\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="NDEBUG;__APPLICATION_NAME__=\&quot;$(ProjectName)\&quot;"\r
                                Culture="1033"\r
+                               AdditionalIncludeDirectories="&quot;$(IntDir)\include&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine=""\r
+                               CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash auto-version.sh &quot;$(InputDir).&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__APPLICATION_NAME__=\&quot;$(ProjectName)\&quot;"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)\WTL75\include&quot;;&quot;$(IntDir)\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(IntDir)\include&quot;"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/PRODUCTVERSION b/WebKitTools/Drosera/win/Drosera.vcproj/PRODUCTVERSION
new file mode 100644 (file)
index 0000000..7da3c16
--- /dev/null
@@ -0,0 +1 @@
+3.0.5
\ No newline at end of file
diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/VERSION b/WebKitTools/Drosera/win/Drosera.vcproj/VERSION
new file mode 100644 (file)
index 0000000..642ea6f
--- /dev/null
@@ -0,0 +1 @@
+525
diff --git a/WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh b/WebKitTools/Drosera/win/Drosera.vcproj/auto-version.sh
new file mode 100644 (file)
index 0000000..5c0e879
--- /dev/null
@@ -0,0 +1,100 @@
+#!/usr/bin/bash
+
+# Copyright (C) 2007 Apple Inc.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+SRCPATH=`cygpath -u "$1"`
+VERSIONPATH=`cygpath -u "$2"`
+VERSIONPATH=$VERSIONPATH/include
+VERSIONFILE=$VERSIONPATH/autoversion.h
+mkdir -p "$VERSIONPATH"
+
+PRODUCTVERSION=`cat "$SRCPATH/PRODUCTVERSION"`
+MAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$SRCPATH/PRODUCTVERSION"`
+MINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$SRCPATH/PRODUCTVERSION"`
+TINYVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$SRCPATH/PRODUCTVERSION"`
+if [ "$TINYVERSION" == "" ]; then
+    TINYVERSION=0
+fi
+
+if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
+    echo -n `cat "$SRCPATH/VERSION"` > "$VERSIONFILE"
+else
+    echo -n $RC_PROJECTSOURCEVERSION > "$VERSIONFILE"
+fi
+
+if [ `grep -c -E "4\.|4$" "$VERSIONFILE"` -ne 0 ]; then
+    echo "Can't set WebKit's version to something that ends in a 4!"
+    echo "If we do, someone's going to think it's Netscape 4."
+    echo "Radar bug 3787996 has some details."
+    exit 1
+fi
+
+BLDMAJORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\1/' "$VERSIONFILE"`
+BLDMINORVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\2/' "$VERSIONFILE"`
+BLDVARIANTVERSION=`sed 's/\([^\.]*\)\.\([^.]*\)\(\.\([^.]*\)\)\?/\4/' "$VERSIONFILE"`
+if [ "$BLDVARIANTVERSION" == "" ]; then
+    BLDVARIANTVERSION=0
+fi
+SVNOPENSOURCEREVISION=`svn info | grep '^Revision' | sed 's/^Revision: \(.*\)/\1/'`
+
+BLDNMBR=`cat "$VERSIONFILE"`
+BLDNMBRSHORT=`cat "$VERSIONFILE"`
+BUILDER=""
+
+if [ "$RC_PROJECTSOURCEVERSION" == "" ]; then
+    echo -n "+" >> "$VERSIONFILE"
+    BLDNMBRSHORT=`cat "$VERSIONFILE"`
+    echo -n " " >> "$VERSIONFILE"
+    echo -n `whoami` >> "$VERSIONFILE"
+    echo -n " - " >> "$VERSIONFILE"
+    echo -n `date` >> "$VERSIONFILE"
+    echo -n " - r$SVNOPENSOURCEREVISION" >> "$VERSIONFILE"
+    BLDNMBR=`cat "$VERSIONFILE"`
+fi
+
+echo -n '#define __VERSION_TEXT__ "' > "$VERSIONFILE"
+echo -n $PRODUCTVERSION >> "$VERSIONFILE"
+echo -n " (" >> "$VERSIONFILE"
+echo -n $BLDNMBR >> "$VERSIONFILE"
+echo ')"' >> "$VERSIONFILE"
+echo -n '#define __BUILD_NUMBER_SHORT__ "' >> "$VERSIONFILE"
+echo -n $BLDNMBRSHORT >> "$VERSIONFILE"
+echo '"' >> "$VERSIONFILE"
+
+echo -n '#define __VERSION_MAJOR__ ' >> "$VERSIONFILE"
+echo $MAJORVERSION >> "$VERSIONFILE"
+echo -n '#define __VERSION_MINOR__ ' >> "$VERSIONFILE"
+echo $MINORVERSION >> "$VERSIONFILE"
+echo -n '#define __VERSION_TINY__ ' >> "$VERSIONFILE"
+echo $TINYVERSION >> "$VERSIONFILE"
+
+echo -n '#define __BUILD_NUMBER_MAJOR__ ' >> "$VERSIONFILE"
+echo $BLDMAJORVERSION >> "$VERSIONFILE"
+echo -n '#define __BUILD_NUMBER_MINOR__ ' >> "$VERSIONFILE"
+echo $BLDMINORVERSION >> "$VERSIONFILE"
+echo -n '#define __BUILD_NUMBER_VARIANT__ ' >> "$VERSIONFILE"
+echo $BLDVARIANTVERSION >> "$VERSIONFILE"
+
+echo -n '#define __SVN_REVISION__ ' >> "$VERSIONFILE"
+echo $SVNREVISION >> "$VERSIONFILE"