List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:January 26 2011 4:39pm
Subject:bzr commit into wex-installer-1.0 branch (reggie.burnett:266)
View as plain text  
#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:reggie.burnett@stripped

  266 Reggie Burnett	2011-01-26
      removing setup folder as we are not using InnoSetup for this project

    removed:
      Setup/
      Setup/config.xml
      Setup/my-template.ini
      Setup/products.xml
      Setup/setup.iss
      Setup/wizard_image.bmp
=== removed directory 'Setup'
=== removed file 'Setup/config.xml'
=== removed directory 'Setup'
=== removed file 'Setup/config.xml'
--- a/Setup/config.xml	2011-01-24 21:19:07 +0000
+++ b/Setup/config.xml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <UpdateURLs>
-    <UpdateURL>
-      <URL>http://downloads.mysql.com/reg/products.xml</URL>
-    </UpdateURL>
-    <UpdateURL>
-      <URL>http://wb.mysql.com/installer/products.xml</URL>
-    </UpdateURL>
-  </UpdateURLs>
-  <UpdateTimeoutMilliseconds>7000</UpdateTimeoutMilliseconds>
-  <UpdateCheckFrequency>7</UpdateCheckFrequency>
-  <ProductCachePath>C:\ProgramData\MySQL\MySQL Universal Installer\Product Cache\</ProductCachePath>
-  <InstallationRoot>C:\Program Files\MySQL\</InstallationRoot>
-  <LicenseAgreement>0</LicenseAgreement>
-  <Location>
-    <X>246</X>
-    <Y>84</Y>
-  </Location>
-  <ProductCode></ProductCode>
-</Configuration>
\ No newline at end of file

=== removed file 'Setup/my-template.ini'
--- a/Setup/my-template.ini	2011-01-24 21:19:07 +0000
+++ b/Setup/my-template.ini	1970-01-01 00:00:00 +0000
@@ -1,326 +0,0 @@
-## MySQL Server Instance Configuration File Template
-## ----------------------------------------------------------------------
-## Version 1.0.4
-##
-## <-- Indicates Template comment.  These lines will not be in the output
-##
-## Replaceable things must be like:
-## 
-## # [VARIABLE_NAME]="Forumla"
-## parameter=default value
-##
-##  For example:
-##
-##  # [PORT]="port"
-##  port=3306
-##
-## Note - In the example, the formula consists of a variable named 'port' which must be defined before processing.
-##
-## In addition to the standard max operators (+, -, /, *), the "formula" field supports the following functions:
-##
-##  rnd(x, y) = Round x to the nearest y
-##  max(x, y) = Max value from x, y
-##  min(x, y) = Min value from x, y
-##
-## and named variables.
-##
-##  For example:
-##
-##  # [MAX_CONNECTIONS]="max_connections:rnd(max(100,max_connections),1000)"
-##  max_connections=
-##
-## ( Note - Unitalized variables have a value of 0. )
-##
-## Finally, there is a special directive named [STATE_CHANGE] that allows for a function to be exectuted at that 
-## point during template processing.  
-##
-##  For example:
-## # [STATE_CHANGE]="new_variable : 1"
-##
-## The following variables must be defined before the formulas are evaluated (otherwise, you get many values set to 0):
-##
-## memory             - Server Type
-##                      Dedicated Server (90% of System Memory), Server (50% of System Memory), All others( rnd(max( 1/12 System Memory, 40*1024*1024), 1024))
-## myiasm_percentage  - Table Type
-##                      If main InnoDB, set to 5.  Allow userdef.
-## active_connections - # Connections.
-##                      DSS = 20, OLTP = 500, else user_defined.
-## cpus               - Number of CPUS on the machine.
-## 
-# Other default tuning values
-##
-## innodb_buffer_pool_size_percentage=2/10
-# [STATE_CHANGE]="over_commit_factor:10"
-##
-##
-# MySQL Server Instance Configuration File
-# ----------------------------------------------------------------------
-# Generated by the MySQL Server Instance Configuration Wizard
-#
-#
-# Installation Instructions
-# ----------------------------------------------------------------------
-#
-# On Linux you can copy this file to /etc/my.cnf to set global options,
-# mysql-data-dir/my.cnf to set server-specific options
-# (@localstatedir@ for this installation) or to
-# ~/.my.cnf to set user-specific options.
-#
-# On Windows you should keep this file in the installation directory 
-# of your server (e.g. C:\Program Files\MySQL\MySQL Server X.Y). To
-# make sure the server reads the config file use the startup option 
-# "--defaults-file". 
-#
-# To run run the server from the command line, execute this in a 
-# command line shell, e.g.
-# mysqld --defaults-file="C:\Program Files\MySQL\MySQL Server X.Y\my.ini"
-#
-# To install the server as a Windows service manually, execute this in a 
-# command line shell, e.g.
-# mysqld --install MySQLXY --defaults-file="C:\Program Files\MySQL\MySQL Server X.Y\my.ini"
-#
-# And then execute this in a command line shell to start the server, e.g.
-# net start MySQLXY
-#
-#
-# Guildlines for editing this file
-# ----------------------------------------------------------------------
-#
-# In this file, you can use all long options that the program supports.
-# If you want to know the options a program supports, start the program
-# with the "--help" option.
-#
-# More detailed information about the individual options can also be
-# found in the manual.
-#
-#
-# CLIENT SECTION
-# ----------------------------------------------------------------------
-#
-# The following options will be read by MySQL client applications.
-# Note that only client applications shipped by MySQL are guaranteed
-# to read this section. If you want your own MySQL client program to
-# honor these values, you need to specify it as an option during the
-# MySQL client library initialization.
-#
-[client]
-
-# [CLIENT_PIPE]=""
-# pipe
-# [CLIENT_SOCKET]=""
-# socket=mysql
-# [CLIENT_PORT]=""
-port=3306
-
-[mysql]
-
-# [CLIENT_DEFAULT_CHARACTER_SET]="default_character_set"
-default-character-set=latin1
-
-
-# SERVER SECTION
-# ----------------------------------------------------------------------
-#
-# The following options will be read by the MySQL Server. Make sure that
-# you have installed the server correctly (see above) so it reads this 
-# file.
-#
-# [SERVER_TYPE]="server_type"
-# server_type=
-[mysqld]
-
-# The next three options are mutually exclusive to SERVER_PORT below.
-# [SERVER_SKIP]=""
-# skip-networking
-# [SERVER_PIPE]=""
-# enable-named-pipe
-# The Pipe the MySQL Server will use
-# [SERVER_SOCKET]=""
-# socket=mysql
-
-# The TCP/IP Port the MySQL Server will listen on
-# [SERVER_PORT]=""
-port=3306
-
-# Path to installation directory. All paths are usually resolved relative to this.
-# [BASE_DIR]="basedir"
-basedir=
-
-# Path to the database root
-# [DATA_DIR]="datadir"
-datadir=
-
-# The default character set that will be used when a new schema or table is
-# created and no character set is defined
-# [SERVER_DEFAULT_CHARACTER_SET]="default_character_set"
-character-set-server=latin1
-
-# The default storage engine that will be used when create new tables when
-# [DEFAULT_STORAGE_ENGINE]="default_storage_engine"
-default-storage-engine=
-
-# Set the SQL mode to strict
-# [SQL_MODE]=""
-sql-mode="STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
-
-# The maximum amount of concurrent sessions the MySQL server will
-# allow. One of these connections will be reserved for a user with
-# SUPER privileges to allow the administrator to login even if the
-# connection limit has been reached.
-# [STATE_CHANGE]="max_connections:rnd(min(active_connections*15/10+10,memory/512K),1000)"
-# [MAX_CONNECTIONS]="max_connections:rnd(max(100,max_connections),1000)"
-max_connections=
-
-# Query cache is used to cache SELECT results and later return them
-# without actual executing the same query once again. Having the query
-# cache enabled may result in significant speed improvements, if your
-# have a lot of identical queries and rarely changing tables. See the
-# "Qcache_lowmem_prunes" status variable to check if the current value
-# is high enough for your load.
-# Note: In case your tables change very often or if your queries are
-# textually different every time, the query cache may result in a
-# slowdown instead of a performance improvement.
-# [STATE_CHANGE]="available_memory:memory-(max_connections*256K)"
-# [STATE_CHANGE]="query_cache_size:max(available_memory/10,8M)","USE_BYTES"
-# [QUERY_CACHE_SIZE]="query_cache_size:query_cache_size * query_cache_pct"
-query_cache_size=
-
-# The number of open tables for all threads. Increasing this value
-# increases the number of file descriptors that mysqld requires.
-# Therefore you have to make sure to set the amount of open files
-# allowed to at least 4096 in the variable "open-files-limit" in
-# section [mysqld_safe]
-# [STATE_CHANGE]="buffers_memory:available_memory*7/10"
-# [STATE_CHANGE]="thread_buffers_memory:available_memory*3/10"
-# [STATE_CHANGE]="memory_per_thread:thread_buffers_memory*over_commit_factor/max_connections"
-# [TABLE_CACHE]="table_cache:rnd(max(256,max_connections*2),1000)"
-table_cache=
-
-# Maximum size for internal (in-memory) temporary tables. If a table
-# grows larger than this value, it is automatically converted to disk
-# based table This limitation is for a single table. There can be many
-# of them.
-# [STATE_CHANGE]="buffers_memory:buffers_memory-table_cache*8K"
-# [STATE_CHANGE]="big_thread_buffers:memory_per_thread*over_commit_factor"
-# [STATE_CHANGE]="tmp_table_size:max(16M,big_thread_buffers)"
-# [TMP_TABLE_SIZE]="tmp_table_size:min(tmp_table_size,memory*1/10)","USE_BYTES"
-tmp_table_size=
-
-# How many threads we should keep in a cache for reuse. When a client
-# disconnects, the client's threads are put in the cache if there aren't
-# more than thread_cache_size threads from before.  This greatly reduces
-# the amount of thread creations needed if you have a lot of new
-# connections. (Normally this doesn't give a notable performance
-# improvement if you have a good thread implementation.)
-# [STATE_CHANGE]="thread_cache_size:max(max_connections*5/100,8)"
-# [THREAD_CACHE_SIZE]="thread_cache_size:rnd(min(thread_cache_size,64),1000)"
-thread_cache_size=
-
-#*** MyISAM Specific options
-# The maximum size of the temporary file MySQL is allowed to use while
-# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE.
-# If the file-size would be bigger than this, the index will be created
-# through the key cache (which is slower).
-myisam_max_sort_file_size=100G
-
-# If the temporary file used for fast index creation would be bigger
-# than using the key cache by the amount specified here, then prefer the
-# key cache method.  This is mainly used to force long character keys in
-# large tables to use the slower key cache method to create the index.
-# [STATE_CHANGE]="myisam_sort_buffer_size:max(8M,big_thread_buffers)"
-# [MYISAM_SORT_BUFFER_SIZE]="myisam_sort_buffer_size:min(myisam_sort_buffer_size,memory*2/10)","USE_BYTES"
-myisam_sort_buffer_size=
-
-# Size of the Key Buffer, used to cache index blocks for MyISAM tables.
-# Do not set it larger than 30% of your available memory, as some memory
-# is also required by the OS to cache rows. Even if you're not using
-# MyISAM tables, you should still set it to 8-64M as it will also be
-# used for internal temporary disk tables.
-# [STATE_CHANGE]="myisam_buffers:buffers_memory*(myisam_percentage/100)"
-# [KEY_BUFFER_SIZE]="key_buffer_size:max(8M,myisam_buffers/2)","USE_BYTES"
-key_buffer_size=
-
-# Size of the buffer used for doing full table scans of MyISAM tables.
-# Allocated per thread, if a full scan is needed.
-# [STATE_CHANGE]="read_buffer_size:min(64K,memory_per_thread*2/100)"
-# [READ_BUFFER_SIZE]="read_buffer_size:min(read_buffer_size,memory/100)","USE_BYTES"
-read_buffer_size=
-# [STATE_CHANGE]="read_rnd_buffer_size:min(256K,memory_per_thread*4/10)"
-# [READ_RND_BUFFER_SIZE]="read_rnd_buffer_size:min(read_rnd_buffer_size,memory*4/100)","USE_BYTES"
-read_rnd_buffer_size=
-
-# This buffer is allocated when MySQL needs to rebuild the index in
-# REPAIR, OPTIMZE, ALTER table statements as well as in LOAD DATA INFILE
-# into an empty table. It is allocated per thread so be careful with
-# large settings.
-# [STATE_CHANGE]="sort_buffer_size:min(256K,memory_per_thread*3/10)"
-# [SORT_BUFFER_SIZE]="sort_buffer_size:min(sort_buffer_size,memory*2/100)","USE_BYTES"
-sort_buffer_size=
-
-#*** INNODB Specific options ***
-# [INNODB_HOME]="innodb_home"
-# innodb_data_home_dir=
-
-# Use this option if you have a MySQL server with InnoDB support enabled
-# but you do not plan to use it. This will save memory and disk space
-# and speed up some things.
-# [SKIP_INNODB]
-# skip-innodb
-
-# Additional memory pool that is used by InnoDB to store metadata
-# information.  If InnoDB requires more memory for this purpose it will
-# start to allocate it from the OS.  As this is fast enough on most
-# recent operating systems, you normally do not need to change this
-# value. SHOW INNODB STATUS will display the current amount used.
-# [STATE_CHANGE]="innodb_buffers:buffers_memory*(1-myisam_percentage/100)"
-# [STATE_CHANGE]="innodb_additional_mem_pool_size:max(2M,innodb_buffers*2/100)"
-# [INNODB_ADDITIONAL_MEM_POOL_SIZE]="innodb_additional_mem_pool_size:min(32M,innodb_additional_mem_pool_size)","USE_BYTES"
-innodb_additional_mem_pool_size=
-
-# If set to 1, InnoDB will flush (fsync) the transaction logs to the
-# disk at each commit, which offers full ACID behavior. If you are
-# willing to compromise this safety, and you are running small
-# transactions, you may set this to 0 or 2 to reduce disk I/O to the
-# logs. Value 0 means that the log is only written to the log file and
-# the log file flushed to disk approximately once per second. Value 2
-# means the log is written to the log file at each commit, but the log
-# file is only flushed to disk approximately once per second.
-innodb_flush_log_at_trx_commit=1
-
-# The size of the buffer InnoDB uses for buffering log data. As soon as
-# it is full, InnoDB will have to flush it to disk. As it is flushed
-# once per second anyway, it does not make sense to have it very large
-# (even with long transactions).
-# [STATE_CHANGE]="innodb_buffers:max(innodb_buffers-innodb_additional_mem_pool_size,0)"
-# [STATE_CHANGE]="innodb_log_buffer_size:max(1M,innodb_buffers/100)"
-# [INNODB_LOG_BUFFER_SIZE]="innodb_log_buffer_size:min(16M,innodb_log_buffer_size)","USE_BYTES"
-innodb_log_buffer_size=
-
-# InnoDB, unlike MyISAM, uses a buffer pool to cache both indexes and
-# row data. The bigger you set this the less disk I/O is needed to
-# access data in tables. On a dedicated database server you may set this
-# parameter up to 80% of the machine physical memory size. Do not set it
-# too large, though, because competition of the physical memory may
-# cause paging in the operating system.  Note that on 32bit systems you
-# might be limited to 2-3.5G of user level memory per process, so do not
-# set it too high.
-# [INNODB_BUFFER_POOL_SIZE]="innodb_buffer_pool_size:max(innodb_buffers-innodb_log_buffer_size,8M)","USE_BYTES"
-innodb_buffer_pool_size=
-
-# Size of each log file in a log group. You should set the combined size
-# of log files to about 25%-100% of your buffer pool size to avoid
-# unneeded buffer pool flush activity on log file overwrite. However,
-# note that a larger logfile size will increase the time needed for the
-# recovery process.
-# [STATE_CHANGE]="innodb_log_file_size:rnd(min(innodb_buffer_pool_size*innodb_buffer_pool_size_percentage,1G),1000)"
-# [INNODB_LOG_FILE_SIZE]="innodb_log_file_size:max(10M,innodb_log_file_size)","USE_BYTES"
-innodb_log_file_size=
-
-# Number of threads allowed inside the InnoDB kernel. The optimal value
-# depends highly on the application, hardware as well as the OS
-# scheduler properties. A too high value may lead to thread thrashing.
-## originally formula was innodb_thread_concurrency=<<{:M=8,2*([CPUS]+[DISKS])}>>
-## but since only one disk will be used in a standard configuration
-## [DISKS] is replaced by 1
-# [INNODB_THREAD_CONCURRENCY]="innodb_thread_concurrency:max(8,2*cpus+1)"
-innodb_thread_concurrency=

=== removed file 'Setup/products.xml'
--- a/Setup/products.xml	2011-01-24 21:19:07 +0000
+++ b/Setup/products.xml	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" format="1">
-  <UpdateURL>file://C:\Users\Reggie\work\wex\installer-updated\Setup_Net\Output\mysql-universal-installer-1.0.5.exe</UpdateURL>
-  <UpdateVersion>1.0.7</UpdateVersion>
-  <UpdateHash>CB69C60143875DA4A6CDCA6E6C9FDC60BFC9853C</UpdateHash>
-  <ProductCatalogs>
-    <ProductCatalogs>
-    <ProductCatalog id="mysql-5.5-gpl" name="MySQL 5.5" description="MySQL 5.5 Community Edition" commercial="false">
-      <SetupTypes>
-        <SetupType flag="1" name="Developer Default" description="Installs all products needed for MySQL development, including" />
-        <SetupType flag="2" name="Server only" description="Installs only the MySQL Server product. Use this type for servers that do not need developer resources" />
-        <SetupType flag="64" name="Full" description="Installs all products from this catalog" />
-        <SetupType flag="128" name="Custom" description="The user can select which products to install" />
-      </SetupTypes>
-      <CatalogProducts>
-        <CatalogProduct productId="mysql-server-5.5-gpl" setupTypeFlags="3" />
-        <CatalogProduct productId="workbench" setupTypeFlags="1" />
-        <CatalogProduct productId="connector-odbc" setupTypeFlags="1" />
-        <CatalogProduct productId="connector-c" setupTypeFlags="1" />
-        <CatalogProduct productId="connector-cpp" setupTypeFlags="1" />
-      </CatalogProducts>
-    </ProductCatalog>
-    <ProductCatalog id="mysql-5.1-gpl" name="MySQL 5.1" description="MySQL 5.1 Community Edition" commercial="false">
-      <SetupTypes>
-        <SetupType flag="1" name="Developer Default" description="Installs all products needed for MySQL development, including" />
-        <SetupType flag="2" name="Server only" description="Installs only the MySQL Server product. Use this type for servers that do not need developer resources" />
-        <SetupType flag="64" name="Full" description="Installs all products from this catalog" />
-        <SetupType flag="128" name="Custom" description="The user can select which products to install" />
-      </SetupTypes>
-      <CatalogProducts>
-        <CatalogProduct productId="mysql-server-5.1-gpl" setupTypeFlags="3" />
-        <CatalogProduct productId="workbench" setupTypeFlags="1" />
-        <CatalogProduct productId="connector-odbc" setupTypeFlags="1" />
-        <CatalogProduct productId="connector-c" setupTypeFlags="1" />
-        <CatalogProduct productId="connector-cpp" setupTypeFlags="1" />
-      </CatalogProducts>
-    </ProductCatalog>
-  </ProductCatalogs>
-  <ProductCategories>
-    <ProductCategory name="Server" title="MySql Servers" description="MySQL Database Servers">
-      <Product name="mysql-server-5.5-gpl" title="MySQL Server" description="The core MySQL database server" upgradeId="{49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3}" urlBaseDir="mysql-5.5">
-        <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-5.5.8-win32.msi" id="{A89C6DB0-E5BE-44A0-99DA-72918C1CCFDE}" thisVersion="5.5.8">
-            <Feature name="MYSQLSERVER" title="MySQL Server" description="Install MySQL Server." default="true" size="0" display="true" hasComponents="true">
-              <Feature name="DebugBinaries" title="Debug binaries" description="Debug/trace versions of executables and libraries" default="true" size="0" display="true" hasComponents="true" />
-              <Feature name="Client" title="Client Programs" description="Various helpful (commandline) tools including the mysql command line client" default="true" size="0" display="true" hasComponents="true" />
-            </Feature>
-            <Feature name="DEVEL" title="Development Components" description="Installs C/C++ header files and libraries" default="true" size="0" display="true" hasComponents="true">
-              <Feature name="SharedLibraries" title="Client C API library (shared)" description="Installs shared client library" default="true" size="0" display="true" hasComponents="true" />
-              <Feature name="Embedded" title="Embedded server library" description="Installs embedded server library" default="false" size="0" display="true" hasComponents="true" />
-            </Feature>
-            <Feature name="DEBUGSYMBOLS" title="Debug Symbols" description="Installs Debug Symbols" default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="MISC" title="MISC" description="MISC" default="true" size="0" display="0" hasComponents="0">
-              <Feature name="IniFiles" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-              <Feature name="Server_Scripts" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            </Feature>
-            <Feature name="InstanceConfig" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="ProgramMenu" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="UserEditableDatafiles" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="RegKeys" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-          </Package>
-        </Packages>
-      </Product>
-      <Product name="mysql-server-5.1-gpl" title="MySQL Server" description="The core MySQL database server" upgradeId="{49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3}" urlBaseDir="mysql-5.1">
-        <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-5.1.54-win32.msi" id="{2430887C-B8A8-49D8-9185-9F451185AF7B}" thisVersion="5.1.54">
-            <Feature name="SERVER" title="MySQL Server" description="Install MySQL Server." default="true" size="0" display="true" hasComponents="true">
-              <Feature name="DebugBinaries" title="Debug binaries" description="Debug/trace versions of executables and libraries" default="true" size="0" display="true" hasComponents="true" />
-              <Feature name="Client" title="Client Programs" description="Various helpful (commandline) tools including the mysql command line client" default="true" size="0" display="true" hasComponents="true" />
-            </Feature>
-            <Feature name="ClientPrograms" title="Client Programs" description="Various helpful (commandline) tools including the mysql-command-line-shell" default="true" size="0" display="true" hasComponents="true">
-              <Feature name="SharedLibraries" title="Client C API library (shared)" description="Installs shared client library" default="true" size="0" display="true" hasComponents="true" />
-              <Feature name="Embedded" title="Embedded server library" description="Installs embedded server library" default="false" size="0" display="true" hasComponents="true" />
-            </Feature>
-            <Feature name="DEBUGSYMBOLS" title="Debug Symbols" description="Installs Debug Symbols" default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="MISC" title="MISC" description="MISC" default="true" size="0" display="0" hasComponents="0">
-              <Feature name="IniFiles" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-              <Feature name="Server_Scripts" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            </Feature>
-            <Feature name="InstanceConfig" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="ProgramMenu" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="UserEditableDatafiles" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="RegKeys" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-          </Package>
-        </Packages>
-      </Product>
-    </ProductCategory>
-    <ProductCategory name="Application" title="Applications" description="Applications that work with MySQL">
-      <Product name="workbench" title="MySQL Workbench" description="The MySQL GUI Developer tool" upgradeId="{84C668F4-A0C9-4585-A463-AADE0EFC9391}" urlBaseDir="MySQLGUITools">
-        <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-workbench-gpl-5.2.31a-win32.msi" id="{38766225-85FA-469B-A373-82BF1923A7E4}" thisVersion="5.2.31">
-            <Feature name="MysqlWorkbenchCore" title="MySQL Workbench Core" description="Core components needed to run MySQL Workbench" default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="UpdateWizard" title="Update Feature" description="Built in update feature that connects to MySQL.com" default="true" size="0" display="true" hasComponents="true" />
-          </Package>
-        </Packages>
-      </Product>
-    </ProductCategory>
-    <ProductCategory name="Connector" title="MySQL Connectors" description="Database drivers for programming languages">
-      <Product name="connector-odbc" title="Connector/ODBC" description="MySQL Connector for ODBC" upgradeId="{FF073FBB-32E2-4052-B6B2-830C5ED4A809}" urlBaseDir="mysql-connector-odbc-5.1">
-        <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-connector-odbc-5.1.6-win32.msi" id="{29042B1C-0713-4575-B7CA-5C8E7B0899D4}" thisVersion="5.1.6">
-            <Feature name="ODBC_32" title="MySQL Connector/ODBC driver" description="Installs the MySQL ODBC 5.1.6 32-bit driver." default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="Help" title="MySQL Connector/ODBC 5.1.6 Documentation" description="Installs the MySQL ODBC driver help." default="true" size="0" display="true" hasComponents="true" />
-          </Package>
-        </Packages>
-      </Product>
-      <Product name="connector-cpp" title="Connector/C++" description="MySQL Connector for C++" upgradeId="{FE990D78-8BB1-4880-930A-0430E707F3CA}" urlBaseDir="">
-        <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-connector-c++-1.0.5-win32.msi" id="{C13C9E31-F8D7-464D-A246-5A42AC0AB93E}" thisVersion="1.0.5">
-            <Feature name="ConnectorCPP" title="MySQL Connector C++" description="The MySQL Connector C++ client library." default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="DebugLibraries" title="Debug Libary" description="Debug library and symbols." default="false" size="0" display="true" hasComponents="true" />
-          </Package>
-        </Packages>
-      </Product>
-      <Product name="connector-C" title="Connector/C" description="MySQL Connector for C" upgradeId="" urlBaseDir="">
-        <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-connector-c-6.0.2-win32.msi" id="{66F9302D-E145-4375-8C84-54DA2339C483}" thisVersion="6.0.2">
-            <Feature name="ConnectorC" title="MySQL Connector C" description="The MySQL Connector C client library." default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="DebugLibraries" title="Debug Libary" description="Debug library and symbols." default="false" size="0" display="true" hasComponents="true" />
-          </Package>
-        </Packages>
-      </Product>
-    </ProductCategory>
-    <ProductCategory name="Documentation" title="Documentation" description="">
-      <Product name="Universal-Docs" title="MySQL Documentation" description="A collection of popular MySQL Documents" upgradeId="{D884632C-A8F2-46E6-9944-F784F5C6A10A}" urlBaseDir="http://wb.mysql.com/installer">
-        <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-universal-installer-document-bundle-1.0.0.0.msi" id="{C2AF9668-BC9E-412F-B766-D8238A8517B0}" thisVersion="1.0.0">
-            <Feature name="ConnCPPA4" title="MySQL Connector C++ User Guide A4" description="The MySQL Connector C++ User Guide in A4 format." default="false" size="0" display="true" hasComponents="true" />
-            <Feature name="ConnCPP" title="MySQL Connector C++ User Guide" description="The MySQL Connector C++ User Guide." default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="ConnNETA4" title="MySQL Connector .NET User Guide A4" description="The MySQL Connector .NET User Guide in A4 fomat" default="false" size="0" display="true" hasComponents="true" />
-            <Feature name="ConnNET" title="MySQL Connector .NET User Guide" description="The MySQL Connector .NET User Guide." default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="ConnODBCA4" title="MySQL Connector ODBC User Guide A4" description="The MySQL Connector ODBC User Guide in A4 format." default="false" size="0" display="true" hasComponents="true" />
-            <Feature name="ConnODBC" title="MySQL Connector ODBC User Guide" description="The MySQL Connector ODBC User Guide." default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="ServerA4Feature" title="MySQL Server User Guide A4" description="The MySQL Server User Guide in A4 format." default="false" size="0" display="true" hasComponents="true" />
-            <Feature name="ServerFeature" title="MySQL Server User Guide" description="The MySQL Server User Guide." default="true" size="0" display="true" hasComponents="true" />
-            <Feature name="WBA4Feature" title="MySQL Workbench User Guide A4" description="MySQL Workbench User Guide in A4 format." default="false" size="0" display="true" hasComponents="true" />
-            <Feature name="WBFeature" title="MySQL Workbench User Guide" description="The MySQL Workbench User Guide." default="true" size="0" display="true" hasComponents="true" />
-          </Package>
-        </Packages>
-      </Product>
-    </ProductCategory>
-  </ProductCategories>
-</ProductManifest>
\ No newline at end of file

=== removed file 'Setup/setup.iss'
--- a/Setup/setup.iss	2011-01-24 21:19:07 +0000
+++ b/Setup/setup.iss	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "MySQL Universal Installer"
-#define MyAppVersion "1.0.5"
-#define MyAppPublisher "Oracle"
-#define MyAppURL "http://www.oracle.com/"
-#define MyAppExeName "WexInstaller.exe"
-#define CommonDataFolder "MySQL\MySQL Universal Installer"
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppID={{1479FFD8-B0C7-406C-8C22-755DD94D5976}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-AppVerName={#MyAppName}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\MySQL\{#MyAppName}
-DisableDirPage=yes
-DisableFinishedPage=true
-DisableProgramGroupPage=yes
-DefaultGroupName=MySQL\{#MyAppName}
-OutputBaseFilename=mysql-universal-installer-{#MyAppVersion}
-SetupIconFile=..\WexInstaller\Resources\mysql-installer.ico
-Compression=none
-SolidCompression=true
-WizardImageFile=C:\Users\Reggie\work\wex\installer\Setup_Net\wizard_image.bmp
-WizardSmallImageFile=C:\Users\Reggie\work\wex\installer\Setup_Net\wizard_image.bmp
-UninstallDisplayIcon={app}\WexInstaller.exe
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
-
-[Files]
-Source: "..\WexInstaller\bin\Debug\WexInstaller.exe"; DestDir: "{app}"; 
-Source: "config.xml"; DestDir: "{commonappdata}\{#CommonDataFolder}"
-Source: "products.xml"; DestName: "products.xml.temp"; DestDir: "{commonappdata}\{#CommonDataFolder}"
-Source: "my-template.ini"; DestDir: "{commonappdata}\{#CommonDataFolder}"
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-; the following are the packages we are shipping in this bundle
-;Source: "ProductCache/mysql-5.5.8-win32.msi"; DestDir: "{commonappdata}/MySQL/MySQL Universal Installer/Product Cache"
-;Source: "ProductCache/mysql-connector-c++-1.0.5-win32.msi"; DestDir: "{commonappdata}/MySQL/MySQL Universal Installer/Product Cache"
-Source: "ProductCache/mysql-connector-c-6.0.2-win32.msi"; DestDir: "{commonappdata}/MySQL/MySQL Universal Installer/Product Cache"
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, "&", "&&")}}"; Flags: nowait
-
-[UninstallDelete]
-Type: filesandordirs; Name: "{commonappdata}\{#CommonDataFolder}"

=== removed file 'Setup/wizard_image.bmp'
Binary files a/Setup/wizard_image.bmp	2011-01-24 21:19:07 +0000 and b/Setup/wizard_image.bmp	1970-01-01 00:00:00 +0000 differ

Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110126163955-tiyjz4qdf1ye0ln3.bundle
Thread
bzr commit into wex-installer-1.0 branch (reggie.burnett:266) Reggie Burnett26 Jan