Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Antoine Belvire
otb
Commits
ba83fdde
Commit
ba83fdde
authored
11 years ago
by
Mickael Savinaud
Browse files
Options
Downloads
Patches
Plain Diff
ENH: rename mvd2-catalogue also into packaging script for windows
parent
4f28e467
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Packaging/Windows/BundleFixing.cmake
+1
-1
1 addition, 1 deletion
Packaging/Windows/BundleFixing.cmake
Packaging/Windows/CMakeLists.txt
+5
-5
5 additions, 5 deletions
Packaging/Windows/CMakeLists.txt
Packaging/Windows/monteverdi2.bat
+1
-1
1 addition, 1 deletion
Packaging/Windows/monteverdi2.bat
with
7 additions
and
7 deletions
Packaging/Windows/BundleFixing.cmake
+
1
−
1
View file @
ba83fdde
include
(
BundleUtilities
)
fixup_bundle
(
"
${
CMAKE_INSTALL_PREFIX
}
/bin/mvd2-viewer.exe"
""
""
)
fixup_bundle
(
"
${
CMAKE_INSTALL_PREFIX
}
/bin/mvd2-catalogue.exe"
""
""
)
\ No newline at end of file
fixup_bundle
(
"
${
CMAKE_INSTALL_PREFIX
}
/bin/monteverdi2.exe"
""
""
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Packaging/Windows/CMakeLists.txt
+
5
−
5
View file @
ba83fdde
...
...
@@ -4,7 +4,7 @@ set(CPACK_NSIS_MODIFY_PATH ON PARENT_SCOPE)
# with the monteverdi2.bat shortcut
set
(
CPACK_NSIS_MENU_LINKS
"bin/mvd2-viewer.bat"
"Monteverdi2 Viewer"
"bin/m
vd2-catalogue
.bat"
"Monteverdi2
Catalogue
"
"bin/m
onteverdi2
.bat"
"Monteverdi2"
PARENT_SCOPE
)
# Since we put bat files as MENU_LINKS, they does not get an icon automatically
...
...
@@ -16,7 +16,7 @@ set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
CreateShortCut
\\\"
$SMPROGRAMS
\\\\
Monteverdi2-
${
Monteverdi2_VERSION_MAJOR
}
.
${
Monteverdi2_VERSION_MINOR
}
\\\\
Monteverdi2 Viewer.lnk
\\\"
\\\"
$INSTDIR
\\\\
bin
\\\\
mvd2-viewer.bat
\\\"
\\\"
\\\"
\\\"
$INSTDIR
\\\\
bin
\\\\
mvd2-viewer.exe
\\\"
"
"
CreateShortCut
\\\"
$SMPROGRAMS
\\\\
Monteverdi2-
${
Monteverdi2_VERSION_MAJOR
}
.
${
Monteverdi2_VERSION_MINOR
}
\\\\
Monteverdi2
Catalogue
.lnk
\\\"
\\\"
$INSTDIR
\\\\
bin
\\\\
m
vd2-catalogue
.bat
\\\"
\\\"
\\\"
\\\"
$INSTDIR
\\\\
bin
\\\\
m
vd2-catalogue
.exe
\\\"
CreateShortCut
\\\"
$SMPROGRAMS
\\\\
Monteverdi2-
${
Monteverdi2_VERSION_MAJOR
}
.
${
Monteverdi2_VERSION_MINOR
}
\\\\
Monteverdi2.lnk
\\\"
\\\"
$INSTDIR
\\\\
bin
\\\\
m
onteverdi2
.bat
\\\"
\\\"
\\\"
\\\"
$INSTDIR
\\\\
bin
\\\\
m
onteverdi2
.exe
\\\"
"
PARENT_SCOPE
)
...
...
@@ -25,12 +25,12 @@ set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
Delete
\\\"
$SMPROGRAMS
\\\\
Monteverdi2-
${
Monteverdi2_VERSION_MAJOR
}
.
${
Monteverdi2_VERSION_MINOR
}
\\\\
Monteverdi2 Viewer.lnk
\\\"
"
"
Delete
\\\"
$SMPROGRAMS
\\\\
Monteverdi2-
${
Monteverdi2_VERSION_MAJOR
}
.
${
Monteverdi2_VERSION_MINOR
}
\\\\
Monteverdi2
Catalogue
.lnk
\\\"
Delete
\\\"
$SMPROGRAMS
\\\\
Monteverdi2-
${
Monteverdi2_VERSION_MAJOR
}
.
${
Monteverdi2_VERSION_MINOR
}
\\\\
Monteverdi2.lnk
\\\"
"
PARENT_SCOPE
)
# Icon for the add-remove program
set
(
CPACK_NSIS_INSTALLED_ICON_NAME
"bin
\\\\
m
vd2-catalogue
.exe"
PARENT_SCOPE
)
set
(
CPACK_NSIS_INSTALLED_ICON_NAME
"bin
\\\\
m
onteverdi2
.exe"
PARENT_SCOPE
)
# set the install/unistall icon used for the installer itself
# There is a bug in NSI that does not handle full unix paths properly.
...
...
@@ -81,7 +81,7 @@ install(FILES qt.conf
COMPONENT Resources
)
install
(
FILES
${
Monteverdi2_SOURCE_DIR
}
/Packaging/Windows/mvd2-viewer.bat
${
Monteverdi2_SOURCE_DIR
}
/Packaging/Windows/m
vd2-catalogue
.bat
${
Monteverdi2_SOURCE_DIR
}
/Packaging/Windows/m
onteverdi2
.bat
DESTINATION bin
COMPONENT Runtime
)
This diff is collapsed.
Click to expand it.
Packaging/Windows/m
vd2-catalogue
.bat
→
Packaging/Windows/m
onteverdi2
.bat
+
1
−
1
View file @
ba83fdde
...
...
@@ -12,4 +12,4 @@
@cd
%HOMEDRIVE%%
HOMEPATH
%
:: Start Monteverdi
@start
"Monteverdi"
/B
"
%CURRENT_SCRIPT_DIR%
m
vd2-catalogue
.exe"
%
*
@start
"Monteverdi"
/B
"
%CURRENT_SCRIPT_DIR%
m
onteverdi2
.exe"
%
*
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment