Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing config-migrator in neo4j-desktop #7517

Merged
merged 1 commit into from
Aug 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions packaging/neo4j-desktop/neo4j-desktop.install4j
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@
<mountPoints>
<mountPoint id="262" root="" location="bin" mode="755" />
<mountPoint id="505" root="" location="bin/Neo4j-Management" mode="755" />
<mountPoint id="567" root="" location="bin/tools" mode="755" />
<mountPoint id="386" root="" location="plugins" mode="755" />
<mountPoint id="210" root="" location="" mode="755" />
</mountPoints>
<entries>
<dirEntry mountPoint="505" file="./target/shell-scripts/Neo4j-Management" overwriteMode="4" shared="false" fileMode="644" uninstallMode="0" overrideFileMode="false" overrideOverwriteMode="false" overrideUninstallMode="false" entryMode="direct" subDirectory="" excludeSuffixes="" dirMode="755" overrideDirMode="false">
<exclude />
</dirEntry>
<fileEntry mountPoint="567" file="./target/shell-scripts/tools/config-migrator.jar" overwriteMode="4" shared="false" fileMode="755" uninstallMode="0" overrideFileMode="true" overrideOverwriteMode="false" overrideUninstallMode="false" />
<fileEntry mountPoint="262" file="./target/neo4j-desktop-@NEO4J_VERSION@.jar" overwriteMode="4" shared="true" fileMode="644" uninstallMode="0" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" />
<fileEntry mountPoint="262" file="./src/main/install4j/neo4j-community.vmoptions" overwriteMode="4" shared="false" fileMode="644" uninstallMode="0" overrideFileMode="false" overrideOverwriteMode="false" overrideUninstallMode="false" />
<fileEntry mountPoint="262" file="./src/main/install4j/install.properties" overwriteMode="4" shared="false" fileMode="644" uninstallMode="0" overrideFileMode="false" overrideOverwriteMode="false" overrideUninstallMode="false" />
Expand Down Expand Up @@ -72,6 +74,13 @@
</include>
<dependencies />
</component>
<component name="tools" id="568" customizedId="" displayDescription="false" hideHelpButton="false" selected="true" changeable="true" downloadable="false" hidden="false">
<description />
<include all="false">
<entry location="bin/tools" fileType="regular" />
</include>
<dependencies />
</component>
</components>
</files>
<launchers>
Expand Down
2 changes: 2 additions & 0 deletions packaging/neo4j-desktop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,15 @@
<mkdir dir="${project.build.directory}/licenses" />
<mkdir dir="${project.build.directory}/plugins" />
<mkdir dir="${project.build.directory}/shell-scripts" />
<mkdir dir="${project.build.directory}/shell-scripts/tools" />
<mkdir dir="${project.build.directory}/shell-scripts/Neo4j-Management" />
<fixcrlf file="${project.basedir}/../../community/LICENSE.txt" destDir="${project.build.directory}/licenses" eol="dos" />
<fixcrlf file="src/main/distribution/text/community/LICENSES.txt" destDir="${project.build.directory}/licenses" eol="dos" />
<fixcrlf file="src/main/distribution/text/community/NOTICE.txt" destDir="${project.build.directory}/licenses" eol="dos" />
<fixcrlf file="src/main/distribution/text/plugins/README.txt" destDir="${project.build.directory}/plugins" eol="dos" />
<copy file="${project.basedir}/../standalone/src/main/distribution/shell-scripts/bin/neo4j-import" todir="${project.build.directory}/shell-scripts" />
<copy file="${project.basedir}/../standalone/src/main/distribution/shell-scripts/bin/neo4j-shell" todir="${project.build.directory}/shell-scripts" />
<copy file="${project.basedir}/../standalone/src/main/distribution/shell-scripts/bin/tools/config-migrator.jar" todir="${project.build.directory}/shell-scripts/tools" />

<copy file="${project.basedir}/../standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management.psd1" todir="${project.build.directory}/shell-scripts" />
<copy file="${project.basedir}/../standalone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Get-Java.ps1" todir="${project.build.directory}/shell-scripts/Neo4j-Management" />
Expand Down