~simdgenius/inkscape/my2

« back to all changes in this revision

Viewing changes to packaging/win32/inkscape.nsi

Committer: Yale Zhang
Date: 2017-09-24 12:08:18 UTC
mfrom: (15617.1.123 inkscape)
Revision ID: yzhang1985@gmail.com-20170924120818-jjpv7rgk55hoozr1

merge

files added:
share/extensions/frame.inx

share/extensions/frame.py

share/extensions/test/frame_test.py

share/extensions/test/svg/single_box.svg

src/helper/geom-pathvectorsatellites.cpp

src/helper/geom-pathvectorsatellites.h

src/helper/geom-satellite.cpp

src/helper/geom-satellite.h

src/helper/gettext.cpp

src/helper/gettext.h

src/live_effects/lpe-bool.cpp

src/live_effects/lpe-bool.h

src/live_effects/lpe-embrodery-stitch-ordering.cpp

src/live_effects/lpe-embrodery-stitch-ordering.h

src/live_effects/lpe-embrodery-stitch.cpp

src/live_effects/lpe-embrodery-stitch.h

src/live_effects/parameter/hidden.cpp

src/live_effects/parameter/hidden.h

src/live_effects/parameter/satellitesarray.cpp

src/live_effects/parameter/satellitesarray.h

src/svg-view-slideshow.cpp

src/svg-view-slideshow.h

files removed:
src/live_effects/parameter/filletchamferpointarray.cpp

src/live_effects/parameter/filletchamferpointarray.h

files modified:
CMakeLists.txt

CMakeScripts/ConfigEnv.cmake

CMakeScripts/ConfigPaths.cmake

CMakeScripts/DefineDependsandFlags.cmake

CMakeScripts/HelperFunctions.cmake

CMakeScripts/HelperMacros.cmake

CMakeScripts/Install.cmake

CMakeScripts/InstallMSYS2.cmake

astylerc

mingwenv.cmake

msys2installdeps.sh

packaging/win32/inkscape.nsi

po/POTFILES.in

po/lv.po

po/ro.po

po/uk.po

share/extensions/ai_input.inx

share/extensions/cgm_input.inx

share/extensions/empty_desktop.inx

share/extensions/extrude.py

share/extensions/hpgl_output.py

share/extensions/plotter.py

share/extensions/plt_input.inx

share/extensions/plt_output.inx

share/extensions/prepare_file_save_as.py *

share/extensions/prepare_print_win32_vector.py *

share/extensions/restack.inx

share/extensions/sk1_input.inx

share/extensions/sk1_output.inx

share/extensions/svg2xaml.xsl

share/extensions/wmf_input.inx

share/extensions/wmf_output.inx

share/filters/CMakeLists.txt

share/icons/icons.svg

share/icons/symbolic_icons.svg

share/icons/tango_icons.svg

share/palettes/CMakeLists.txt

share/patterns/CMakeLists.txt

share/symbols/CMakeLists.txt

share/templates/CMakeLists.txt

src/CMakeLists.txt

src/display/drawing-image.cpp

src/document.cpp

src/document.h

src/ege-color-prof-tracker.cpp

src/extension/db.cpp

src/extension/extension.cpp

src/extension/internal/bluredge.cpp

src/extension/internal/cairo-render-context.cpp

src/extension/internal/cdr-input.cpp

src/extension/internal/pdfinput/pdf-input.cpp

src/extension/internal/vsd-input.cpp

src/extension/internal/wmf-print.cpp

src/extension/param/bool.cpp

src/extension/param/bool.h

src/extension/param/color.cpp

src/extension/param/color.h

src/extension/param/description.cpp

src/extension/param/description.h

src/extension/param/enum.cpp

src/extension/param/enum.h

src/extension/param/float.cpp

src/extension/param/float.h

src/extension/param/int.cpp

src/extension/param/int.h

src/extension/param/notebook.cpp

src/extension/param/notebook.h

src/extension/param/parameter.cpp

src/extension/param/parameter.h

src/extension/param/radiobutton.cpp

src/extension/param/radiobutton.h

src/extension/param/string.cpp

src/extension/param/string.h

src/extension/prefdialog.cpp

src/file-update.cpp

src/file.cpp

src/file.h

src/helper/CMakeLists.txt

src/inkview.cpp

src/io/sys.cpp

src/knotholder.h

src/libnrtype/FontFactory.cpp

src/libnrtype/font-instance.h

src/libuemf/uwmf.c

src/libuemf/uwmf.h

src/livarot/PathOutline.cpp

src/live_effects/CMakeLists.txt

src/live_effects/effect-enum.h

src/live_effects/effect.cpp

src/live_effects/effect.h

src/live_effects/lpe-bendpath.cpp

src/live_effects/lpe-bounding-box.cpp

src/live_effects/lpe-bspline.cpp

src/live_effects/lpe-clone-original.cpp

src/live_effects/lpe-clone-original.h

src/live_effects/lpe-constructgrid.cpp

src/live_effects/lpe-copy_rotate.cpp

src/live_effects/lpe-copy_rotate.h

src/live_effects/lpe-curvestitch.cpp

src/live_effects/lpe-dynastroke.cpp

src/live_effects/lpe-envelope.cpp

src/live_effects/lpe-extrude.cpp

src/live_effects/lpe-fill-between-many.cpp

src/live_effects/lpe-fill-between-strokes.cpp

src/live_effects/lpe-fillet-chamfer.cpp

src/live_effects/lpe-fillet-chamfer.h

src/live_effects/lpe-interpolate.cpp

src/live_effects/lpe-jointype.cpp

src/live_effects/lpe-knot.cpp

src/live_effects/lpe-lattice.cpp

src/live_effects/lpe-line_segment.cpp

src/live_effects/lpe-measure-line.cpp

src/live_effects/lpe-measure-line.h

src/live_effects/lpe-mirror_symmetry.cpp

src/live_effects/lpe-mirror_symmetry.h

src/live_effects/lpe-offset.cpp

src/live_effects/lpe-parallel.cpp

src/live_effects/lpe-path_length.cpp

src/live_effects/lpe-patternalongpath.cpp

src/live_effects/lpe-perp_bisector.cpp

src/live_effects/lpe-perspective-envelope.cpp

src/live_effects/lpe-perspective_path.cpp

src/live_effects/lpe-powerstroke.cpp

src/live_effects/lpe-recursiveskeleton.cpp

src/live_effects/lpe-rough-hatches.cpp

src/live_effects/lpe-ruler.cpp

src/live_effects/lpe-skeleton.cpp

src/live_effects/lpe-sketch.cpp

src/live_effects/lpe-tangent_to_curve.cpp

src/live_effects/lpe-taperstroke.cpp

src/live_effects/lpe-test-doEffect-stack.cpp

src/live_effects/lpe-text_label.cpp

src/live_effects/lpe-transform_2pts.cpp

src/live_effects/lpe-vonkoch.cpp

src/live_effects/lpeobject.cpp

src/live_effects/parameter/array.cpp

src/live_effects/parameter/array.h

src/live_effects/parameter/bool.cpp

src/live_effects/parameter/bool.h

src/live_effects/parameter/enum.h

src/live_effects/parameter/fontbutton.cpp

src/live_effects/parameter/fontbutton.h

src/live_effects/parameter/item.cpp

src/live_effects/parameter/item.h

src/live_effects/parameter/originalpatharray.h

src/live_effects/parameter/parameter.cpp

src/live_effects/parameter/parameter.h

src/live_effects/parameter/path.cpp

src/live_effects/parameter/path.h

src/live_effects/parameter/point.cpp

src/live_effects/parameter/point.h

src/live_effects/parameter/powerstrokepointarray.h

src/live_effects/parameter/random.cpp

src/live_effects/parameter/random.h

src/live_effects/parameter/text.cpp

src/live_effects/parameter/text.h

src/live_effects/parameter/togglebutton.cpp

src/live_effects/parameter/togglebutton.h

src/live_effects/parameter/transformedpoint.cpp

src/live_effects/parameter/transformedpoint.h

src/live_effects/parameter/unit.cpp

src/live_effects/parameter/unit.h

src/live_effects/parameter/vector.cpp

src/live_effects/parameter/vector.h

src/main-cmdlinexact.cpp

src/main.cpp

src/object-set.h

src/path-chemistry.cpp

src/preferences.cpp

src/selection-chemistry.cpp

src/sp-anchor.cpp

src/sp-anchor.h

src/sp-ellipse.cpp

src/sp-ellipse.h

src/sp-item-group.cpp

src/sp-item.cpp

src/sp-item.h

src/sp-lpe-item.cpp

src/sp-lpe-item.h

src/sp-pattern.cpp

src/sp-shape.cpp

src/sp-spiral.cpp

src/sp-spiral.h

src/sp-star.cpp

src/sp-star.h

src/splivarot.cpp

src/style-enums.h

src/svg/svg-affine-test.h

src/text-editing.cpp

src/ui/clipboard.cpp

src/ui/dialog/livepatheffect-add.cpp

src/ui/dialog/livepatheffect-editor.cpp

src/ui/dialog/livepatheffect-editor.h

src/ui/dialog/lpe-fillet-chamfer-properties.cpp

src/ui/dialog/lpe-fillet-chamfer-properties.h

src/ui/dialog/objects.cpp

src/ui/dialog/objects.h

src/ui/dialog/styledialog.cpp

src/ui/interface.cpp

src/ui/interface.h

src/ui/object-edit.cpp

src/ui/tool/path-manipulator.cpp

src/ui/tools/calligraphic-tool.cpp

src/ui/tools/freehand-base.cpp

src/ui/tools/measure-tool.cpp

src/ui/uxmanager.cpp

src/ui/uxmanager.h

src/ui/widget/clipmaskicon.cpp

src/ui/widget/clipmaskicon.h

src/ui/widget/color-scales.cpp

src/ui/widget/font-variants.cpp

src/ui/widget/font-variants.h

src/ui/widget/rotateable.cpp

src/ui/widget/selected-style.cpp

src/ui/widget/selected-style.h

src/verbs.cpp

src/verbs.h

src/widgets/stroke-marker-selector.cpp

src/winconsole.cpp

src/xml/repr-io.cpp

Show diffs side-by-side

added added

removed removed

packaging/win32/inkscape.nsi

136

; Find inkscape distribution directory (uncomment line below to manually define)

137

;!define INKSCAPE_DIST_DIR ..\..\inkscape

138

!ifdef INKSCAPE_DIST_DIR

139

${!ifnexist} ${INKSCAPE_DIST_DIR}\inkscape.exe

139

${!defineifexist} ${INKSCAPE_DIST_DIR}\inkscape.exe FOUND 1

140

!ifndef FOUND

140

141

!error "inkscape.exe not found in INKSCAPE_DIST_DIR ('${INKSCAPE_DIST_DIR}')"

142

!endif

141

143

!endif

142

144

!ifndef INKSCAPE_DIST_DIR

143

${!defineifexist} ${INKSCAPE_DIST_DIR}\inkscape.exe INKSCAPE_DIST_DIR ..\..\inkscape ; btool default

145

${!defineifexist} ..\..\inkscape\inkscape.exe INKSCAPE_DIST_DIR ..\..\inkscape ; btool default

144

146

!endif

145

147

!ifndef INKSCAPE_DIST_DIR

146

148

${!defineifexist} ..\..\build\inkscape\inkscape.exe INKSCAPE_DIST_DIR ..\..\build\inkscape ; cmake default

424

426

Section "$(Startmenu)" SecStartMenu ; Start menu shortcut {{{

425

427

SectionIn 1 2 3

426

428

!ifndef DUMMYINSTALL

429

SetOutPath $INSTDIR

427

430

CreateShortcut $SMPROGRAMS\Inkscape.lnk $INSTDIR\inkscape.exe

428

431

!endif

429

432

SectionEnd ; SecStartMenu }}}

431

434

Section "$(Desktop)" SecDesktop ; Desktop shortcut {{{

432

435

SectionIn 1 2 3

433

436

!ifndef DUMMYINSTALL

437

SetOutPath $INSTDIR

434

438

CreateShortCut $DESKTOP\Inkscape.lnk $INSTDIR\inkscape.exe

435

439

!endif

436

440

SectionEnd ; SecDesktop }}}

438

442

Section "$(Quicklaunch)" SecQuickLaunch ; Quick Launch shortcut {{{

439

443

SectionIn 1 2 3

440

444

!ifndef DUMMYINSTALL

445

SetOutPath $INSTDIR

441

446

${IfThen} $QUICKLAUNCH != $TEMP ${|} CreateShortCut $QUICKLAUNCH\Inkscape.lnk $INSTDIR\inkscape.exe ${|}

442

447

!endif

443

448

SectionEnd ; SecQuickLaunch }}}

Older »