From 1fc6607f2617ae7ae4f7911490b6e39deb45090b Mon Sep 17 00:00:00 2001
From: jurgen <serge-rider@users.noreply.github.com>
Date: Sat, 23 Aug 2014 16:44:57 +0000
Subject: [PATCH] Enterprise build

---
 plugins/org.jkiss.dbeaver.nosql.cassandra/plugin.xml | 4 ++--
 product/build.xml                                    | 1 +
 product/installer/nsis/DBeaver.nsi                   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.nosql.cassandra/plugin.xml b/plugins/org.jkiss.dbeaver.nosql.cassandra/plugin.xml
index f6c80edbfc..6863cb3755 100644
--- a/plugins/org.jkiss.dbeaver.nosql.cassandra/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.nosql.cassandra/plugin.xml
@@ -52,12 +52,12 @@
                 <driver
                     id="apache_cassandra"
                     label="Cassandra Thrift"
-                    category="NoSQL"
+                    category="Cassandra"
                     class="org.jkiss.jdbc.cassandra.CassandraDriver"
                     sampleURL="jdbc:jkiss:cassandra://{host}[:{port}]/{database}"
                     defaultPort="9160"
                     webURL="http://cassandra.jkiss.org/"
-                    description="Driver for Apache Cassandra"
+                    description="Driver for Apache Cassandra 0.x-1.x"
                     icon="icons/cassandra_icon.png">
                     <property name="structResultSet" value="true"/>
                     <replace provider="generic" driver="cassandra_jkiss"/>
diff --git a/product/build.xml b/product/build.xml
index 7131c5ee5c..fec2141178 100644
--- a/product/build.xml
+++ b/product/build.xml
@@ -340,6 +340,7 @@
         <filter filtersfile="build.properties"/>
         <filter token="arch" value="${arch}"/>
         <filter token="product.dir" value="..\..\.."/>
+        <filter token="dist.dir" value="${distSource}"/>
         <copy todir="${buildDirectory}/installer/${arch}" filtering="true">
             <fileset dir="installer/nsis">
                 <include name="*.*" />
diff --git a/product/installer/nsis/DBeaver.nsi b/product/installer/nsis/DBeaver.nsi
index 73f3ea4b18..4f05dcb7b8 100644
--- a/product/installer/nsis/DBeaver.nsi
+++ b/product/installer/nsis/DBeaver.nsi
@@ -17,7 +17,7 @@
   Caption "DBeaver Setup"
   BrandingText "Universal Database Manager"
   Icon "@product.dir@\docs\dbeaver.ico"
-  OutFile "@product.dir@\dist\@archivePrefix@-@productVersion@-@arch@-setup.exe"
+  OutFile "@dist.dir@\dist\@archivePrefix@-@productVersion@-@arch@-setup.exe"
 
   VIAddVersionKey "ProductName" "DBeaver"
   VIAddVersionKey "Comments" "Universal Database Manager"
-- 
GitLab