Add WinCE installer to the Gears SConscript build.

Review URL: http://codereview.chromium.org/7324

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3421 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 42 insertions, 9 deletions

diff --git a/gears/SConscript b/gears/SConscript
index a7d26d6..9b9c562 100644
--- a/gears/SConscript
+++ b/gears/SConscript
@@ -89,7 +89,7 @@ env.Replace(
 env.Replace(
     MAJOR = '0',
     MINOR = '4',
-    BUILD = '23',
+    BUILD = '24',
     PATCH = '0',
     VERSION = '${MAJOR}.${MINOR}.${BUILD}.${PATCH}',
 
@@ -430,7 +430,7 @@ if env['OS'] in ['win32', 'wince']:
 # npapi.h to take precedence.
             '$PRIVATE_THIRD_PARTY_DIR/atlmfc_vc80/files/include',
             '$PRIVATE_THIRD_PARTY_DIR/platformsdk_vc80/files/include',
-            '$PRIVATE_THIRD_PARTY_DIR/vc_80/files/include',
+            '$PRIVATE_THIRD_PARTY_DIR/vc_80/files/vc/include',
         ],
         VC80_LIBPATH = [
             '$PRIVATE_THIRD_PARTY_DIR/atlmfc_vc80/files/lib',
diff --git a/gears/SConscript.dll b/gears/SConscript.dll
index 9095031..0d0ddbf 100644
--- a/gears/SConscript.dll
+++ b/gears/SConscript.dll
@@ -937,6 +937,12 @@ if env['OS'] == 'wince':
       '$OPEN_DIR/installer/iemobile/setup.rc.m4',
   ]
 
+  wince_setup_srcs = [
+      '$OPEN_DIR/installer/iemobile/process_restarter.cc',
+      '$OPEN_DIR/installer/iemobile/setup.cc',
+      env_res.RES('$GENFILES_DIR/setup.rc'),
+  ]
+
 #-----------------------------------------------------------------------------
 # image
 
@@ -1152,3 +1158,6 @@ if env['OS'] in ['win32', 'wince']:
 module = env.ChromeSharedLibrary('gears',
     srcs['all'] + libs + dll_resources)
 env.Alias('gears', module)
+
+if env['OS'] == 'wince':
+  wince_setup = env.ChromeSharedLibrary('setup', wince_setup_srcs)
diff --git a/gears/SConscript.installers b/gears/SConscript.installers
index 532d941..66b8f918 100644
--- a/gears/SConscript.installers
+++ b/gears/SConscript.installers
@@ -13,9 +13,11 @@ env = env.Clone(
     INSTALLER_BASENAME = 'gears-${OS}-${MODE}-${VERSION}',
     FF_XPI = '$INSTALLER_BASEDIR/${INSTALLER_BASENAME}.xpi',
     WIN32_INSTALLER_MSI = '$INSTALLER_BASEDIR/${INSTALLER_BASENAME}.msi',
+    WINCE_INSTALLER_CAB = '$INSTALLER_BASEDIR/${INSTALLER_BASENAME}.cab',
 
     FF2_MODULE = '${SHLIBPREFIX}gears_ff2${SHLIBSUFFIX}',
     MODULE = '${SHLIBPREFIX}gears${SHLIBSUFFIX}',
+    WINCE_SETUP = '${SHLIBPREFIX}setup${SHLIBSUFFIX}',
 
     # Clean up the '#' in *_OUTDIR.
     BASE_OUTDIR = env.Entry('$BASE_OUTDIR').path,
@@ -63,8 +65,6 @@ if env['OS'] == 'win32':
       MSI_VERSION = '${MAJOR}.${MINOR}.${MSI_BUILD}',
   )
 
-  # You can change the names of PRODUCT_ID vars, but NEVER change their values!
-
   # Building wxiobjs with candle
   env.Replace(
       CANDLEDEFPREFIX = '-d',
@@ -77,6 +77,7 @@ if env['OS'] == 'win32':
 # Note: Since light.exe is run from $OPEN_DIR, candle.exe must generate
 # output with paths relative to that dir.
       SCONS_DIR = '../../../..',  # the scons dir relative to OPEN_DIR
+# You can change the names of ProductId vars, but NEVER change their values!
       CANDLEDEFINES = [
           ('OurWin32ProductId',
             GGUIDGen('OUR_PRODUCT_ID')),
@@ -150,6 +151,10 @@ def SafeMkdir(dir):
     return 0
   return Action(Func, 'SafeMkdir(' + dir + ')')
 
+def ToUnixPath(path):
+  """Converts windows-style \ to unix-style /."""
+  return re.sub(r'\\', r'/', path)
+
 def FirefoxInstaller(env):
   # This step is a little hackish.
   # Why: We want to copy files from both the build and source dirs.  We have
@@ -227,17 +232,36 @@ def Win32Installer(env):
       StripOutdir(['$COMMON_GENFILES_DIR/win32_msi.wxs']),
       '$CANDLECOM')
   # light.exe must be run from $OPEN_DIR
-  msi = env.Command('$WIN32_INSTALLER_MSI', wxiobj,
-      'cd $OPEN_DIR && light.exe -out ${TARGET.abspath} ${SOURCE.abspath}')
-  env.Depends(msi, '$FF_XPI')
-  env.Depends(msi, StripOutdir(['$IE_OUTDIR/$MODULE']))
+  msi = env.Command(
+      '$WIN32_INSTALLER_MSI',
+      [wxiobj, '$FF_XPI', StripOutdir(['$IE_OUTDIR/$MODULE'])],
+      'cd $OPEN_DIR && light.exe -out ${TARGET.abspath} ${SOURCES[0].abspath}')
   return msi
 env.AddMethod(Win32Installer, 'Win32Installer')
 
+def WinCEInstaller(env):
+  env['ToUnixPath'] = ToUnixPath
+  inf_outdir = ToUnixPath(env.subst('$IE_OUTDIR'))
+  inf = env.Command(
+      StripOutdir(['$COMMON_GENFILES_DIR/wince_cab_fixed.inf']),
+      StripOutdir(['$COMMON_GENFILES_DIR/wince_cab.inf']),
+      'sed -e "s#bin-....wince-arm.ie.#' + inf_outdir + '#g" $SOURCE > $TARGET')
+  cab = env.Command(
+      '$WINCE_INSTALLER_CAB',
+      [inf, StripOutdir(['$IE_OUTDIR/$MODULE']),
+       StripOutdir(['$IE_OUTDIR/$WINCE_SETUP'])],
+      ['cabwiz ${ToUnixPath(str(SOURCE))} /compress'
+       ' /err ${SOURCES[0].base}.log',
+       Copy('$TARGET', '${SOURCE.base}.CAB')])
+  return cab
+env.AddMethod(WinCEInstaller, 'WinCEInstaller')
+
 installers = []
 if 'FF3' in env['VALID_BROWSERS']:
   installers += env.FirefoxInstaller()
-if env['OS'] in 'win32':
+if env['OS'] == 'win32':
   installers += env.Win32Installer()
+if env['OS'] == 'wince':
+  installers += env.WinCEInstaller()
 
 env.Alias('gears-installers', installers)