← Back to branch summary

~maria-captains/mariadb-native-client/trunk

« back to all changes in this revision

Viewing changes to win/packaging/mariadb-connector-c.xml.in

  • Committer: Georg Richter
  • Date: 2014-12-13 14:29:32 UTC
  • Revision ID: georg@mariadb.com-20141213142932-cu3x3zih1q1xv6ct
More msi fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
win/packaging/mariadb-connector-c.xml.in
24
24
    </Feature>
25
25
    <Feature Id="IncludeFeature" Title="Include Files" Level="1">
26
26
      <ComponentRef Id="Includes"/>
 
27
      <ComponentRef Id="MysqlIncludes"/>
27
28
    </Feature>
28
29
  </Product>
29
30
 
36
37
              <Directory Id="instlib_debug" Name="debug"/>
37
38
              <Directory Id="instlib_plugin" Name="plugin"/>
38
39
            </Directory>
39
 
            <Directory Id="instinclude" Name="include" />
 
40
            <Directory Id="instinclude" Name="include" >
 
41
              <Directory Id="instincludemysql" Name="mysql"/>
 
42
            </Directory>
40
43
          </Directory>  
41
 
        </Directory>
 
44
        </Directory>  
42
45
      </Directory>
43
46
    </Directory>
44
47
  </Fragment>
45
48
 
46
 
  <Fragment>
47
 
    <!--<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">-->
48
 
      <Component Id="RegistryKeys" Guid="755726EA-9706-413D-86B3-E70582FF2819" DiskId="1" Directory="INSTALLFOLDER" Win64="@IS_WIN64@">
49
 
        <RegistryKey Id="Version" Root="HKLM" Key="SOFTWARE\@PRODUCT_MANUFACTURER@\@PRODUCT_NAME@" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
50
 
          <RegistryValue Name="Version" Type="string" Value="@PRODUCT_VERSION@"/>
51
 
        </RegistryKey>
52
 
      </Component>
53
 
      <Component Id="Library" Guid="89E28283-23AE-4F10-B743-B5FA485E9F9A" KeyPath="yes" DiskId="1" Directory="instlib" Win64="@IS_WIN64@">
54
 
        <File Id="libdll" Name="libmariadb.dll"  DiskId="1"  Source="@CLIENT_LIB_DIR@/libmariadb.dll" />
55
 
        <File Id="libdllimp" Name="libmariadb.lib"  DiskId="1"  Source="@CLIENT_LIB_DIR@/libmariadb.lib" />
56
 
        <File Id="libstatic" Name="mariadbclient.lib"  DiskId="1"  Source="@CLIENT_LIB_DIR@/mariadbclient.lib" />
57
 
      </Component>
58
 
      <Component Id="DebugLibrary" Guid="1b8f741d-e7d9-48f1-9e11-9270216d1dc7" KeyPath="yes" DiskId="1" Directory="instlib_debug" Win64="@IS_WIN64@">
59
 
        <File Id="dlibdll" Name="libmariadb.dll"  DiskId="1"  Source="@CLIENT_DBG_DIR@/libmariadb.dll" />
60
 
        <File Id="dlibdllimp" Name="libmariadb.lib"  DiskId="1"  Source="@CLIENT_DBG_DIR@/libmariadb.lib" />
61
 
        <File Id="dlibstatic" Name="mariadbclient.lib"  DiskId="1"  Source="@CLIENT_DBG_DIR@/mariadbclient.lib" />
62
 
      </Component>
63
 
      <Component Id="Plugins" Guid="" KeyPath="yes" DiskId="1" Directory="instlib_plugin" Win64="@IS_WIN64@">
64
 
        @MARIADB_PLUGINS@
65
 
      </Component>
66
 
      <Component Id="Debug" Guid="FFAFCCCC-4E0C-4A87-840C-53B63C8A427A" KeyPath="yes" Directory="instlib" DiskId="1" Win64="@IS_WIN64@">
67
 
        <File Id="libdllpdb" Name="libmariadb.pdb"  DiskId="1"  Source="@CLIENT_LIB_DIR@/libmariadb.pdb" />
68
 
        <File Id="libstaticpdb" Name="mariadbclient.pdb"  DiskId="1"  Source="@CLIENT_LIB_DIR@/mariadbclient.pdb" />
69
 
      </Component>
70
 
      <Component Id="Includes" Guid="5CFB93CC-FC30-4E13-B665-E52690AB56E3" KeyPath="yes" Directory="instinclude" DiskId="1" Win64="@IS_WIN64@">
71
 
        @MARIADB_INCLUDE_FILES@
72
 
      </Component>
73
 
      <!--      </ComponentGroup> -->
74
 
  </Fragment>
 
49
<Fragment>
 
50
    <Component Id="RegistryKeys" Guid="755726EA-9706-413D-86B3-E70582FF2819" DiskId="1" Directory="INSTALLFOLDER" Win64="@IS_WIN64@">
 
51
      <RegistryKey Id="Version" Root="HKLM" Key="SOFTWARE\@PRODUCT_MANUFACTURER@\@PRODUCT_NAME@" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
 
52
        <RegistryValue Name="Version" Type="string" Value="@PRODUCT_VERSION@"/>
 
53
      </RegistryKey>
 
54
    </Component>
 
55
    <Component Id="Library" Guid="89E28283-23AE-4F10-B743-B5FA485E9F9A" KeyPath="yes" DiskId="1" Directory="instlib" Win64="@IS_WIN64@">
 
56
      <File Id="libdll" Name="libmariadb.dll"  DiskId="1"  Source="@CLIENT_LIB_DIR@/libmariadb.dll" />
 
57
      <File Id="libdllimp" Name="libmariadb.lib"  DiskId="1"  Source="@CLIENT_LIB_DIR@/libmariadb.lib" />
 
58
      <File Id="libstatic" Name="mariadbclient.lib"  DiskId="1"  Source="@CLIENT_LIB_DIR@/mariadbclient.lib" />
 
59
    </Component>
 
60
    <Component Id="DebugLibrary" Guid="1b8f741d-e7d9-48f1-9e11-9270216d1dc7" KeyPath="yes" DiskId="1" Directory="instlib_debug" Win64="@IS_WIN64@">
 
61
      <File Id="dlibdll" Name="libmariadb.dll"  DiskId="1"  Source="@CLIENT_DBG_DIR@/libmariadb.dll" />
 
62
      <File Id="dlibdllimp" Name="libmariadb.lib"  DiskId="1"  Source="@CLIENT_DBG_DIR@/libmariadb.lib" />
 
63
      <File Id="dlibstatic" Name="mariadbclient.lib"  DiskId="1"  Source="@CLIENT_DBG_DIR@/mariadbclient.lib" />
 
64
    </Component>
 
65
    <Component Id="Plugins" Guid="5B2E98C9-DFF2-4129-8360-C6AD16F6BBEA" KeyPath="yes" DiskId="1" Directory="instlib_plugin" Win64="@IS_WIN64@">
 
66
      @MARIADB_PLUGINS@
 
67
    </Component>
 
68
    <Component Id="Debug" Guid="FFAFCCCC-4E0C-4A87-840C-53B63C8A427A" KeyPath="yes" Directory="instlib" DiskId="1" Win64="@IS_WIN64@">
 
69
      <File Id="libdllpdb" Name="libmariadb.pdb"  DiskId="1"  Source="@CLIENT_LIB_DIR@/libmariadb.pdb" />
 
70
      <File Id="libstaticpdb" Name="mariadbclient.pdb"  DiskId="1"  Source="@CLIENT_LIB_DIR@/mariadbclient.pdb" />
 
71
    </Component>
 
72
    <Component Id="Includes" Guid="5CFB93CC-FC30-4E13-B665-E52690AB56E3" KeyPath="yes" Directory="instinclude" DiskId="1" Win64="@IS_WIN64@">
 
73
      @MARIADB_INCLUDE_FILES@
 
74
    </Component>
 
75
    <Component Id="MysqlIncludes" Guid="*" Directory="instincludemysql">
 
76
      @MARIADB_INCLUDEMYSQL_FILES@
 
77
    </Component>
 
78
</Fragment>
75
79
</Wix>
 
80