1 files changed, 6 insertions, 78 deletions
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index 37cc692..d75e02f 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -55,18 +55,8 @@ env.Prepend(
         '$GTEST_DIR',
         '#/..',
     ],
-    CPPDEFINES = [
-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
-        'WIN32_LEAN_AND_MEAN',
-    ],
     CCFLAGS = [
         '/TP',
-
-        '/Wp64',
-
-        '/wd4503',
-        '/wd4819',
-
         '/GS-',         # because we link with /NODEFAULTLIB
     ],
     LINKFLAGS = [
@@ -145,84 +135,22 @@ env.Depends(packed, '$TARGET_ROOT/setup.exe')
 
 
 env_version = env.Clone(
-    VERSION_BAT = File('#/../chrome/tools/build/win/version.bat'),
-    CHROMEDIR = Dir('#/../chrome'),
-    PWD = Dir('.'),
+    VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),
+    CHROMEDIR = env.Dir('$CHROME_DIR'),
+    PWD = env.Dir('.'),
 )
 
 env_version.Command('mini_installer_exe_version.rc',
                     ['mini_installer_exe_version.rc.version',
-                     '$CHROMEDIR/VERSION',
-                     '$CHROMEDIR/BRANDING'],
+                     '$CHROME_DIR/VERSION',
+                     '$CHROME_DIR/BRANDING'
+                    ],
                     "$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET")
 
 
-#/Od
-#/I
-#"C:\src\trunk-vs\chrome\..\testing\gtest\include"
-#/I
-#"C:\src\trunk-vs\chrome\..\testing\gtest"
-#/I
-#"C:\src\trunk-vs\chrome\.."
-#/I
-#"C:\src\trunk-vs\chrome\third_party\wtl\include"
-#/I
-#"C:\src\trunk-vs\chrome\..\third_party\platformsdk_vista_6_0\files\Include"
-#/I
-#"C:\src\trunk-vs\chrome\..\third_party\platformsdk_vista_6_0\files\VC\INCLUDE"
-#/I
-#"C:\Program
-#Files\Microsoft
-#Visual
-#Studio
-#8\\VC\atlmfc\include"
-#/D
-#"UNIT_TEST"
-#/D
-#"_DEBUG"
-#/D
-#"_WIN32_WINNT=0x0600"
-#/D
-#"WINVER=0x0600"
-#/D
-#"WIN32"
-#/D
-#"_WINDOWS"
-#/D
-#"_HAS_EXCEPTIONS=0"
-#/D
-#"NOMINMAX"
-#/D
-#"_CRT_RAND_S"
-#/D
-#"CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"
-#/D
-#"WIN32_LEAN_AND_MEAN"
-#/D
-#"_UNICODE"
-#/D
-#"UNICODE"
-#/FD
-#/RTC1
-#/MTd
-#/Gy
-#/GR-
-#/Fo"C:\src\trunk-vs\chrome\Debug\obj\installer_unittests\\"
-#/Fd"C:\src\trunk-vs\chrome\Debug\obj\installer_unittests\vc80.pdb"
-#/W3
-#/WX
-#/c
-#/Wp64
-#/Zi
-#/TP
-#/wd4503
-#/wd4819
-
 env_test.Prepend(
     CPPDEFINES = [
         'UNIT_TEST',
-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
-        'WIN32_LEAN_AND_MEAN',
     ],
     CPPPATH = [
         '$GTEST_DIR/include',