Repository: kylin Updated Branches: refs/heads/master 4e5a936c2 -> 959c6ddb7
KYLIN-1490 Use InstallShield 2015 to generate ODBC Driver setup files Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/959c6ddb Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/959c6ddb Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/959c6ddb Branch: refs/heads/master Commit: 959c6ddb77bafbbb8490cf01a700cb924dc8e804 Parents: 4e5a936 Author: lidongsjtu <lid...@apache.org> Authored: Sun Mar 13 16:15:02 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Sun Mar 13 16:15:02 2016 +0800 ---------------------------------------------------------------------- odbc/Installer(64bit)/Installer(64bit).isl | 26 +++++++++++----------- odbc/Installer(64bit)/Installer(64bit).isproj | 2 +- odbc/Installer/Installer.isl | 26 +++++++++++----------- odbc/Installer/Installer.isproj | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/959c6ddb/odbc/Installer(64bit)/Installer(64bit).isl ---------------------------------------------------------------------- diff --git a/odbc/Installer(64bit)/Installer(64bit).isl b/odbc/Installer(64bit)/Installer(64bit).isl index 90332f7..3393ac5 100644 --- a/odbc/Installer(64bit)/Installer(64bit).isl +++ b/odbc/Installer(64bit)/Installer(64bit).isl @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -2371,12 +2371,6 @@ <row><td>WindowsFolder</td><td/><td/><td>1</td></row> </table> - <table name="ISPowerShellWrap"> - <col key="yes" def="s72">Action_</col> - <col key="yes" def="s72">Name</col> - <col def="S0">Value</col> - </table> - <table name="ISProductConfiguration"> <col key="yes" def="s72">ISProductConfiguration</col> <col def="S255">ProductConfigurationFlags</col> @@ -3848,6 +3842,12 @@ <col def="s255">Value</col> </table> + <table name="ISWSEWrap"> + <col key="yes" def="s72">Action_</col> + <col key="yes" def="s72">Name</col> + <col def="S0">Value</col> + </table> + <table name="ISXmlElement"> <col key="yes" def="s72">ISXmlElement</col> <col def="s72">ISXmlFile_</col> @@ -4033,7 +4033,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= <row><td>SaveAsSchema</td><td/></row> <row><td>SccEnabled</td><td>0</td></row> <row><td>SccPath</td><td/></row> - <row><td>SchemaVersion</td><td>774</td></row> + <row><td>SchemaVersion</td><td>776</td></row> <row><td>Type</td><td>MSIE</td></row> </table> @@ -4395,7 +4395,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= <row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row> <row><td>ProductCode</td><td>{C8B1B296-2F8B-423F-97D5-429C9B6D2AE6}</td><td/></row> <row><td>ProductName</td><td>KylinODBCDriver (x64)</td><td/></row> - <row><td>ProductVersion</td><td>1.1.0000</td><td/></row> + <row><td>ProductVersion</td><td>1.5.0000</td><td/></row> <row><td>ProgressType0</td><td>install</td><td/></row> <row><td>ProgressType1</td><td>Installing</td><td/></row> <row><td>ProgressType2</td><td>installed</td><td/></row> @@ -5167,9 +5167,6 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= <row><td>ISPathVariable</td><td>TestValue</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>The test value of the path variable.</td></row> <row><td>ISPathVariable</td><td>Type</td><td>N</td><td/><td/><td/><td/><td/><td>1;2;4;8</td><td>The type of the path variable.</td></row> <row><td>ISPathVariable</td><td>Value</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>The value of the path variable.</td></row> - <row><td>ISPowerShellWrap</td><td>Action_</td><td>N</td><td/><td/><td>CustomAction</td><td>1</td><td>Identifier</td><td/><td>Foreign key into CustomAction table</td></row> - <row><td>ISPowerShellWrap</td><td>Name</td><td>N</td><td/><td/><td/><td/><td>Text</td><td/><td>Property associated with this Action</td></row> - <row><td>ISPowerShellWrap</td><td>Value</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>Value associated with this Property</td></row> <row><td>ISProductConfiguration</td><td>GeneratePackageCode</td><td>Y</td><td/><td/><td/><td/><td>Number</td><td>0;1</td><td>Indicates whether or not to generate a package code.</td></row> <row><td>ISProductConfiguration</td><td>ISProductConfiguration</td><td>N</td><td/><td/><td/><td/><td>Text</td><td/><td>The name of the product configuration.</td></row> <row><td>ISProductConfiguration</td><td>ProductConfigurationFlags</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>Product configuration (release) flags.</td></row> @@ -5407,6 +5404,9 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= <row><td>ISVirtualShortcut</td><td>Name</td><td>N</td><td/><td/><td/><td/><td>Identifier</td><td/><td>Property name</td></row> <row><td>ISVirtualShortcut</td><td>Shortcut_</td><td>N</td><td/><td/><td>Shortcut</td><td>1</td><td>Identifier</td><td/><td>Foreign key into Shortcut table.</td></row> <row><td>ISVirtualShortcut</td><td>Value</td><td>N</td><td/><td/><td/><td/><td/><td/><td>Property value</td></row> + <row><td>ISWSEWrap</td><td>Action_</td><td>N</td><td/><td/><td>CustomAction</td><td>1</td><td>Identifier</td><td/><td>Foreign key into CustomAction table</td></row> + <row><td>ISWSEWrap</td><td>Name</td><td>N</td><td/><td/><td/><td/><td>Text</td><td/><td>Property associated with this Action</td></row> + <row><td>ISWSEWrap</td><td>Value</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>Value associated with this Property</td></row> <row><td>ISXmlElement</td><td>Content</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>Element contents</td></row> <row><td>ISXmlElement</td><td>ISAttributes</td><td>Y</td><td/><td/><td/><td/><td>Number</td><td/><td>Internal XML element attributes</td></row> <row><td>ISXmlElement</td><td>ISXmlElement</td><td>N</td><td/><td/><td/><td/><td>Identifier</td><td/><td>Primary key, non-localized, internal token for Xml element</td></row> http://git-wip-us.apache.org/repos/asf/kylin/blob/959c6ddb/odbc/Installer(64bit)/Installer(64bit).isproj ---------------------------------------------------------------------- diff --git a/odbc/Installer(64bit)/Installer(64bit).isproj b/odbc/Installer(64bit)/Installer(64bit).isproj index 7c4b2f6..81b3021 100644 --- a/odbc/Installer(64bit)/Installer(64bit).isproj +++ b/odbc/Installer(64bit)/Installer(64bit).isproj @@ -44,7 +44,7 @@ <TargetPath>My Test Exe.exe</TargetPath> </TaggedOutputs> --> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath32)\InstallShield\2013Limited\InstallShield.targets"/> + <Import Project="$(MSBuildExtensionsPath32)\InstallShield\2015Limited\InstallShield.targets"/> <ItemGroup> <ProjectReference Include="..\Driver\driver.vcxproj"> <Name>Driver</Name> http://git-wip-us.apache.org/repos/asf/kylin/blob/959c6ddb/odbc/Installer/Installer.isl ---------------------------------------------------------------------- diff --git a/odbc/Installer/Installer.isl b/odbc/Installer/Installer.isl index 7fd01fa..a23656a 100644 --- a/odbc/Installer/Installer.isl +++ b/odbc/Installer/Installer.isl @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -2352,12 +2352,6 @@ <row><td>WindowsFolder</td><td/><td/><td>1</td></row> </table> - <table name="ISPowerShellWrap"> - <col key="yes" def="s72">Action_</col> - <col key="yes" def="s72">Name</col> - <col def="S0">Value</col> - </table> - <table name="ISProductConfiguration"> <col key="yes" def="s72">ISProductConfiguration</col> <col def="S255">ProductConfigurationFlags</col> @@ -3829,6 +3823,12 @@ <col def="s255">Value</col> </table> + <table name="ISWSEWrap"> + <col key="yes" def="s72">Action_</col> + <col key="yes" def="s72">Name</col> + <col def="S0">Value</col> + </table> + <table name="ISXmlElement"> <col key="yes" def="s72">ISXmlElement</col> <col def="s72">ISXmlFile_</col> @@ -4014,7 +4014,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= <row><td>SaveAsSchema</td><td/></row> <row><td>SccEnabled</td><td>0</td></row> <row><td>SccPath</td><td/></row> - <row><td>SchemaVersion</td><td>774</td></row> + <row><td>SchemaVersion</td><td>776</td></row> <row><td>Type</td><td>MSIE</td></row> </table> @@ -4376,7 +4376,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= <row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row> <row><td>ProductCode</td><td>{A920FB5E-591B-4537-901D-7D0303088884}</td><td/></row> <row><td>ProductName</td><td>KylinODBCDriver (x86)</td><td/></row> - <row><td>ProductVersion</td><td>1.1.0000</td><td/></row> + <row><td>ProductVersion</td><td>1.5.0000</td><td/></row> <row><td>ProgressType0</td><td>install</td><td/></row> <row><td>ProgressType1</td><td>Installing</td><td/></row> <row><td>ProgressType2</td><td>installed</td><td/></row> @@ -5147,9 +5147,6 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= <row><td>ISPathVariable</td><td>TestValue</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>The test value of the path variable.</td></row> <row><td>ISPathVariable</td><td>Type</td><td>N</td><td/><td/><td/><td/><td/><td>1;2;4;8</td><td>The type of the path variable.</td></row> <row><td>ISPathVariable</td><td>Value</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>The value of the path variable.</td></row> - <row><td>ISPowerShellWrap</td><td>Action_</td><td>N</td><td/><td/><td>CustomAction</td><td>1</td><td>Identifier</td><td/><td>Foreign key into CustomAction table</td></row> - <row><td>ISPowerShellWrap</td><td>Name</td><td>N</td><td/><td/><td/><td/><td>Text</td><td/><td>Property associated with this Action</td></row> - <row><td>ISPowerShellWrap</td><td>Value</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>Value associated with this Property</td></row> <row><td>ISProductConfiguration</td><td>GeneratePackageCode</td><td>Y</td><td/><td/><td/><td/><td>Number</td><td>0;1</td><td>Indicates whether or not to generate a package code.</td></row> <row><td>ISProductConfiguration</td><td>ISProductConfiguration</td><td>N</td><td/><td/><td/><td/><td>Text</td><td/><td>The name of the product configuration.</td></row> <row><td>ISProductConfiguration</td><td>ProductConfigurationFlags</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>Product configuration (release) flags.</td></row> @@ -5387,6 +5384,9 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA= <row><td>ISVirtualShortcut</td><td>Name</td><td>N</td><td/><td/><td/><td/><td>Identifier</td><td/><td>Property name</td></row> <row><td>ISVirtualShortcut</td><td>Shortcut_</td><td>N</td><td/><td/><td>Shortcut</td><td>1</td><td>Identifier</td><td/><td>Foreign key into Shortcut table.</td></row> <row><td>ISVirtualShortcut</td><td>Value</td><td>N</td><td/><td/><td/><td/><td/><td/><td>Property value</td></row> + <row><td>ISWSEWrap</td><td>Action_</td><td>N</td><td/><td/><td>CustomAction</td><td>1</td><td>Identifier</td><td/><td>Foreign key into CustomAction table</td></row> + <row><td>ISWSEWrap</td><td>Name</td><td>N</td><td/><td/><td/><td/><td>Text</td><td/><td>Property associated with this Action</td></row> + <row><td>ISWSEWrap</td><td>Value</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>Value associated with this Property</td></row> <row><td>ISXmlElement</td><td>Content</td><td>Y</td><td/><td/><td/><td/><td>Text</td><td/><td>Element contents</td></row> <row><td>ISXmlElement</td><td>ISAttributes</td><td>Y</td><td/><td/><td/><td/><td>Number</td><td/><td>Internal XML element attributes</td></row> <row><td>ISXmlElement</td><td>ISXmlElement</td><td>N</td><td/><td/><td/><td/><td>Identifier</td><td/><td>Primary key, non-localized, internal token for Xml element</td></row> http://git-wip-us.apache.org/repos/asf/kylin/blob/959c6ddb/odbc/Installer/Installer.isproj ---------------------------------------------------------------------- diff --git a/odbc/Installer/Installer.isproj b/odbc/Installer/Installer.isproj index 7c4b2f6..81b3021 100644 --- a/odbc/Installer/Installer.isproj +++ b/odbc/Installer/Installer.isproj @@ -44,7 +44,7 @@ <TargetPath>My Test Exe.exe</TargetPath> </TaggedOutputs> --> </ItemGroup> - <Import Project="$(MSBuildExtensionsPath32)\InstallShield\2013Limited\InstallShield.targets"/> + <Import Project="$(MSBuildExtensionsPath32)\InstallShield\2015Limited\InstallShield.targets"/> <ItemGroup> <ProjectReference Include="..\Driver\driver.vcxproj"> <Name>Driver</Name>
