← Back to branch summary

~ubuntu-branches/ubuntu/lucid/php5/lucid

« back to all changes in this revision

Viewing changes to win32/build/confutils.js

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-03-16 09:09:50 UTC
  • mfrom: (1.1.18 upstream) (0.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100316090950-e36m0pzranoixifd
Tags: 5.3.2-1ubuntu1
* Merge from debian unstable: 
  - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
      universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
  - Dropped debian/patches/libedit_is_editline.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
win32/build/confutils.js
41
41
VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
42
42
VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
43
43
VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 
44
VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
44
45
 
45
46
var VC_VERSIONS_SHORT = new Array();
46
47
VC_VERSIONS_SHORT[1200] = 'VC6';
48
49
VC_VERSIONS_SHORT[1310] = 'VC7.1';
49
50
VC_VERSIONS_SHORT[1400] = 'VC8';
50
51
VC_VERSIONS_SHORT[1500] = 'VC9';
 
52
VC_VERSIONS_SHORT[1600] = 'VC10';
51
53
 
52
54
if (PROGRAM_FILES == null) {
53
55
        PROGRAM_FILES = "C:\\Program Files";