Linux: build a 32-bit Debian package too.

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

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

6 files changed, 52 insertions, 3 deletions

diff --git a/o3d/installer/linux/build.scons b/o3d/installer/linux/build.scons
index c68c93e..50e93a5 100644
--- a/o3d/installer/linux/build.scons
+++ b/o3d/installer/linux/build.scons
@@ -149,8 +149,8 @@ if subprocess.Popen(["which", "dpkg-buildpackage"],
                $$(dirname $TARGET)""")
     return targets
 
-
-  BuildDebianPackage(["debian_amd64/changelog",
+  # Build amd64 package.
+  BuildDebianPackage(["debian_common/changelog",
                       "debian_amd64/control",
                       "debian_amd64/google-o3d.install",
                       "debian_amd64/links",
@@ -167,7 +167,18 @@ if subprocess.Popen(["which", "dpkg-buildpackage"],
                      output_dir='$ARTIFACTS_DIR',
                      force_version=env.get('O3D_PLUGIN_VERSION'))
 
-  # TODO(tschmelcher): Also build an i386 deb.
+  # Build i386 package.
+  BuildDebianPackage(["debian_common/changelog",
+                      "debian_i386/control",
+                      "debian_i386/google-o3d.install",
+                      "debian_i386/links",
+                      "debian_i386/rules"
+                     ],
+                     [("libnpo3dautoplugin.so",
+                           '$ARTIFACTS_DIR/libnpo3dautoplugin.so')
+                     ],
+                     output_dir='$ARTIFACTS_DIR',
+                     force_version=env.get('O3D_PLUGIN_VERSION'))
 
 else:
   print('dpkg-buildpackage not found in PATH; Debian packages will not be '
diff --git a/o3d/installer/linux/debian_amd64/changelog b/o3d/installer/linux/debian_common/changelog
index 47efedf..47efedf 100644
--- a/o3d/installer/linux/debian_amd64/changelog
+++ b/o3d/installer/linux/debian_common/changelog
diff --git a/o3d/installer/linux/debian_i386/control b/o3d/installer/linux/debian_i386/control
new file mode 100644
index 0000000..57f1b9f
--- /dev/null
+++ b/o3d/installer/linux/debian_i386/control
@@ -0,0 +1,17 @@
+Source: google-o3d
+Section: non-free/web
+Priority: optional
+Maintainer: Tristan Schmelcher <tschmelcher@google.com>
+Build-Depends: debhelper (>= 4.0.0), cdbs (>=0.4.34ubuntu4)
+Standards-Version: 3.7.2
+
+Package: google-o3d
+Architecture: i386
+Depends: libc6, libstdc++6, libgcc1, zlib1g, libglew1.5, nvidia-cg-toolkit
+Conflicts: o3d-plugin
+Replaces: o3d-plugin
+Description: Google O3D Plugin
+ O3D is an open-source web API for creating rich, interactive 3D applications in
+ the browser.
+ .
+ This package provides the NPAPI browser plugin for running O3D-based web apps.
diff --git a/o3d/installer/linux/debian_i386/google-o3d.install b/o3d/installer/linux/debian_i386/google-o3d.install
new file mode 100644
index 0000000..17e2a72
--- /dev/null
+++ b/o3d/installer/linux/debian_i386/google-o3d.install
@@ -0,0 +1 @@
+libnpo3dautoplugin.so opt/google/o3d
diff --git a/o3d/installer/linux/debian_i386/links b/o3d/installer/linux/debian_i386/links
new file mode 100644
index 0000000..54f1d70
--- /dev/null
+++ b/o3d/installer/linux/debian_i386/links
@@ -0,0 +1,7 @@
+/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/iceape/plugins/libnpo3dautoplugin.so
+/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/iceweasel/plugins/libnpo3dautoplugin.so
+/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/mozilla/plugins/libnpo3dautoplugin.so
+/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/firefox/plugins/libnpo3dautoplugin.so
+/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/midbrowser/plugins/libnpo3dautoplugin.so
+/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/xulrunner/plugins/libnpo3dautoplugin.so
+/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/xulrunner-addons/plugins/libnpo3dautoplugin.so
diff --git a/o3d/installer/linux/debian_i386/rules b/o3d/installer/linux/debian_i386/rules
new file mode 100755
index 0000000..2bd95e0
--- /dev/null
+++ b/o3d/installer/linux/debian_i386/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+# Needed for dpkg-shlibdeps to be able to find the libraries we ship with so as
+# to properly calculate our shared library dependencies.
+export LD_LIBRARY_PATH=$(shell echo $$LD_LIBRARY_PATH:$$PWD)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+# For the 32-bit package, shlibdeps may not be able to find the three dependent
+# libraries because they aren't included in our package and we don't list them
+# as a build dependency (because we can't, since on a 64-bit system that would
+# be resolved with the 64-bit packages). So, we suppress errors for this case.
+DEB_DH_SHLIBDEPS_ARGS_ALL = -- --ignore-missing-info