From 7fd2c5191914bcca90585257e76f5a37f53328db Mon Sep 17 00:00:00 2001 From: su_v Date: Tue, 9 Oct 2012 07:04:30 +0200 Subject: packaging/macosx: copy hicolor index.theme into app bundle Fixed bugs: - https://launchpad.net/bugs/446842 (bzr r11762) --- packaging/macosx/osx-app.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packaging') diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index c413e2d0f..ef4301c17 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -270,6 +270,10 @@ rsync -av "$binary_dir/../share/locale"/* "$pkgresources/locale" mkdir -p "$pkgresources/share" cp -rp "$LIBPREFIX/share/mime" "$pkgresources/share/" +# Copy GTK hicolor icon theme index file +mkdir -p "$pkgresources/share/icons/hicolor" +cp "$LIBPREFIX/share/icons/hicolor/index.theme" "$pkgresources/share/icons/hicolor" + # Icons and the rest of the script framework rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" -- cgit v1.2.3 From d3a0448358ea348a814d04a0ae49b8808dd861f7 Mon Sep 17 00:00:00 2001 From: su_v Date: Tue, 9 Oct 2012 07:35:32 +0200 Subject: packaging/macosx: update default theme for newer Clearlooks engine Fixed bugs: - https://launchpad.net/bugs/875577 (bzr r11763) --- .../Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc | 68 +++++++++++++++------- 1 file changed, 46 insertions(+), 22 deletions(-) (limited to 'packaging') diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc index a8b3d4c4c..171e73626 100644 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc +++ b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc @@ -13,36 +13,38 @@ pixmap_path "${THEMEDIR}" style "clearlooks-default" { GtkButton ::default_border = { 0, 0, 0, 0 } - GtkRange ::trough_border = 0 - GtkPaned ::handle_size = 6 - GtkRange ::slider_width = 15 - GtkRange ::stepper_size = 15 - GtkScrollbar ::min_slider_length = 30 - GtkCheckButton ::indicator_size = 12 + GtkRange ::trough_border = 0 + GtkPaned ::handle_size = 6 + GtkRange ::slider_width = 15 + GtkRange ::stepper_size = 15 + GtkScale ::slider-length = 23 + GtkScale ::trough-side-details = 1 + GtkScrollbar ::min_slider_length = 30 + GtkCheckButton ::indicator_size = 12 GtkMenuBar ::internal-padding = 0 - GtkTreeView ::expander_size = 14 - GtkExpander ::expander_size = 16 + GtkTreeView ::expander_size = 14 + GtkExpander ::expander_size = 16 xthickness = 1 ythickness = 1 - fg[NORMAL] = "#000000" # black + fg[NORMAL] = "#000000" # black fg[PRELIGHT] = "#000000" # black fg[SELECTED] = "#ffffff" # white - fg[ACTIVE] = "#000000" # black - fg[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray + fg[ACTIVE] = "#000000" # black + fg[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray - bg[NORMAL] = {0.95, 0.95, 0.95} # very light gray + bg[NORMAL] = {0.95, 0.95, 0.95} # very light gray bg[PRELIGHT] = "#ffffff" # white bg[SELECTED] = OSX_MENU_COLOR_PLACEHOLDER # menu color - bg[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray - bg[ACTIVE] = {0.85, 0.85, 0.85} # gray + bg[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray + bg[ACTIVE] = {0.85, 0.85, 0.85} # gray base[NORMAL] = "#ffffff" # white base[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER # menu color base[ACTIVE] = {0.6, 0.6, 0.6} # dark gray base[SELECTED] = OSX_HILI_COLOR_PLACEHOLDER # highlight color - base[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray + base[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray text[NORMAL] = "#000000" # black text[PRELIGHT] = "#000000" # black @@ -52,10 +54,13 @@ style "clearlooks-default" engine "clearlooks" { - menubarstyle = 1 # 0 = flat, 1 = sunken, 2 = flat gradient - menuitemstyle = 0 # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button) - listviewitemstyle = 0 # 0 = flat, 1 = 3d-ish (gradient) - progressbarstyle = 0 # 0 = candy bar, 1 = flat + colorize_scrollbar = FALSE #TRUE + reliefstyle = 1 + menubarstyle = 0 # 0 = flat, 1 = sunken, 2 = flat gradient + toolbarstyle = 0 # 0 = flat, 1 = enable effects + animation = FALSE + radius = 3.0 # 3.0 = default, 0.0 = sharp corners + style = GUMMY # CLASSIC, GUMMY, GLOSSY } } @@ -72,6 +77,10 @@ style "clearlooks-button" = "clearlooks-default" ythickness = 3 bg[NORMAL] = "#f0f1f2" # a hint of blue... + + engine "clearlooks" { + style = CLASSIC + } } style "clearlooks-notebook" = "clearlooks-wide" @@ -95,13 +104,18 @@ style "clearlooks-menu" = "clearlooks-default" style "clearlooks-menu-item" = "clearlooks-default" { - xthickness = 2 - ythickness = 3 + xthickness = 0 + ythickness = 2 + fg[PRELIGHT] = "#ffffff" text[PRELIGHT] = "#ffffff" # We want PRELIGHT to be white for widgets, but coloured for the menu. bg[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER + # Radius of the menu items (inside menus) + engine "clearlooks" { + radius = 0.0 + } } style "clearlooks-menu-itembar" = "clearlooks-default" @@ -517,7 +531,17 @@ gtk-font-name="Lucida Grande 10" # # insckape-decoration layers lock, "affect" icons, etc. # -gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=22,22:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=16,16" +#gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=22,22:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=16,16" +gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=12,12" # use OS X default pdf-viewer for print preview gtk-print-preview-command="/usr/bin/open %f" + +# Whether images should be shown on buttons. +# Default value: TRUE +gtk-button-images = 0 + +# Whether images should be shown in menus. +gtk-menu-images = 0 + + -- cgit v1.2.3 From 2538274683b2a7f7eb3799772ac9d69dce3b40ae Mon Sep 17 00:00:00 2001 From: su_v Date: Tue, 9 Oct 2012 08:28:36 +0200 Subject: packaging/macosx: detect system language in launcher script - add console messages to help debug incorrect LANG settings - use 'en_US.UTF-8' fallback setting for LANG if currect detection fails addresses issues with failing python extensions which use setlocale() as discussed in the comments of bug #406662 (bzr r11765) --- packaging/macosx/Resources/bin/inkscape | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'packaging') diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index f18948aff..486877fa4 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -114,17 +114,36 @@ fi # If the AppleCollationOrder preference doesn't exist, we fall back to using # the AppleLocale preference. LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` -if [ "x$LANGSTR" == "x" ] +if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] then echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2 LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ sed 's/_.*//'` + echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 +else + echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 fi # NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape # to crash on startup in locale_from_utf8(). -export LANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ - tail -n1 | sed 's/\./ /' | awk '{print $2}'`.UTF-8" +if [ "x$LANGSTR" == "x" ] +then + # override broken script + echo "Overriding empty LANGSTR" 1>&2 + export LANG="en_US.UTF-8" +else + tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ + tail -n1 | sed 's/\./ /' | awk '{print $2}'`" + if [ "x$tmpLANG" == "x" ] + then + # override broken script + echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="en_US.UTF-8" + else + echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="$tmpLANG.UTF-8" + fi +fi echo "Setting Language: $LANG" 1>&2 sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc" -- cgit v1.2.3 From a5d9583c5f6ba016d34959d8c49d0b2803084302 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 15 Oct 2012 16:31:05 -0500 Subject: Doesn't seem these are up-to-date and are just generic files in the repo (bzr r11804.1.1) --- .../portable/Other/Help/images/donation_button.png | Bin 2396 -> 0 bytes .../win32/portable/Other/Help/images/favicon.ico | Bin 2550 -> 0 bytes .../Other/Help/images/help_background_footer.png | Bin 216 -> 0 bytes .../Other/Help/images/help_background_header.png | Bin 283 -> 0 bytes .../portable/Other/Help/images/help_logo_top.png | Bin 8576 -> 0 bytes .../portable/Other/Source/AppNamePortable.ini | 6 - .../portable/Other/Source/LauncherLicense.txt | 339 --------------------- packaging/win32/portable/Other/Source/Readme.txt | 47 --- 8 files changed, 392 deletions(-) delete mode 100644 packaging/win32/portable/Other/Help/images/donation_button.png delete mode 100644 packaging/win32/portable/Other/Help/images/favicon.ico delete mode 100644 packaging/win32/portable/Other/Help/images/help_background_footer.png delete mode 100644 packaging/win32/portable/Other/Help/images/help_background_header.png delete mode 100644 packaging/win32/portable/Other/Help/images/help_logo_top.png delete mode 100644 packaging/win32/portable/Other/Source/AppNamePortable.ini delete mode 100644 packaging/win32/portable/Other/Source/LauncherLicense.txt delete mode 100644 packaging/win32/portable/Other/Source/Readme.txt (limited to 'packaging') diff --git a/packaging/win32/portable/Other/Help/images/donation_button.png b/packaging/win32/portable/Other/Help/images/donation_button.png deleted file mode 100644 index 53bf471e2..000000000 Binary files a/packaging/win32/portable/Other/Help/images/donation_button.png and /dev/null differ diff --git a/packaging/win32/portable/Other/Help/images/favicon.ico b/packaging/win32/portable/Other/Help/images/favicon.ico deleted file mode 100644 index 9e08ee0d5..000000000 Binary files a/packaging/win32/portable/Other/Help/images/favicon.ico and /dev/null differ diff --git a/packaging/win32/portable/Other/Help/images/help_background_footer.png b/packaging/win32/portable/Other/Help/images/help_background_footer.png deleted file mode 100644 index abb6f814e..000000000 Binary files a/packaging/win32/portable/Other/Help/images/help_background_footer.png and /dev/null differ diff --git a/packaging/win32/portable/Other/Help/images/help_background_header.png b/packaging/win32/portable/Other/Help/images/help_background_header.png deleted file mode 100644 index 0fe013e30..000000000 Binary files a/packaging/win32/portable/Other/Help/images/help_background_header.png and /dev/null differ diff --git a/packaging/win32/portable/Other/Help/images/help_logo_top.png b/packaging/win32/portable/Other/Help/images/help_logo_top.png deleted file mode 100644 index 8d06ee22c..000000000 Binary files a/packaging/win32/portable/Other/Help/images/help_logo_top.png and /dev/null differ diff --git a/packaging/win32/portable/Other/Source/AppNamePortable.ini b/packaging/win32/portable/Other/Source/AppNamePortable.ini deleted file mode 100644 index e85e60f6a..000000000 --- a/packaging/win32/portable/Other/Source/AppNamePortable.ini +++ /dev/null @@ -1,6 +0,0 @@ -AdditionalParameters= -DisableSplashScreen=false -RunLocally=false - -# The above options are explained in the included readme.txt -# This INI file is an example only and is not used unless it is placed as described in the included readme.txt diff --git a/packaging/win32/portable/Other/Source/LauncherLicense.txt b/packaging/win32/portable/Other/Source/LauncherLicense.txt deleted file mode 100644 index 89e08fb00..000000000 --- a/packaging/win32/portable/Other/Source/LauncherLicense.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/packaging/win32/portable/Other/Source/Readme.txt b/packaging/win32/portable/Other/Source/Readme.txt deleted file mode 100644 index 7c03cdaf2..000000000 --- a/packaging/win32/portable/Other/Source/Readme.txt +++ /dev/null @@ -1,47 +0,0 @@ -The base application's source code is available from the portable app's -homepage listed in the help.html file (if applicable). - -Details of most other things are available there as well. - -LICENSE -======= - -This package's installer and launcher are released under the GPL. The launcher -is the PortableApps.com Launcher, available with full source and documentation -from http://portableapps.com/development. We request that developers using the -PortableApps.com Launcher please leave this directory intact and unchanged. - -USER CONFIGURATION -================== - -Some configuration in the PortableApps.com Launcher can be overridden by the -user in an INI file next to **AppID**Portable.exe called **AppID**Portable.ini. -If you are happy with the default options, it is not necessary, though. There -is an example INI included with this package to get you started. To use it, -copy AppNamePortable.ini from this directory to **AppID**Portable.ini next to -**AppID**Portable.exe. The options in the INI file are as follows: - - AdditionalParameters= - DisableSplashScreen=false - RunLocally=false - -(There is no need for an INI header in this file; if you have one, though, it -won't damage anything.) - -The AdditionalParameters entry allows you to pass additional command-line -parameters to the application. - -The DisableSplashScreen entry allows you to run the launcher without the splash -screen showing up. The default is false. - -The RunLocally entry allows you to run the portable application from a read- -only medium. This is known as Live mode. It copies what it needs to to a -temporary directory on the host computer, runs the application, and then -deletes it afterwards, leaving nothing behind. This can be useful for running -the application from a CD or if you work on a computer that may have spyware or -viruses and you'd like to keep your device set to read-only. As a consequence -of this technique, any changes you make during the Live mode session aren't -saved back to your device. The default is false. - -There may be other values also permitted in the user configuration file by the -portable application; refer to help.html for any details of them. -- cgit v1.2.3 From 3c5295dca37c5355b7a4a448f711c9ab14185252 Mon Sep 17 00:00:00 2001 From: Adib Taraben Date: Thu, 15 Nov 2012 23:12:16 +0100 Subject: add wix scripts to nuild win32 .msi package (bzr r11875) --- packaging/wix/README | 19 ++++++++++ packaging/wix/files.py | 86 ++++++++++++++++++++++++++++++++++++++++++++++ packaging/wix/inkscape.wxs | 77 +++++++++++++++++++++++++++++++++++++++++ packaging/wix/install.bat | 30 ++++++++++++++++ packaging/wix/next_uuid.py | 10 ++++++ packaging/wix/wixenv.bat | 4 +++ 6 files changed, 226 insertions(+) create mode 100644 packaging/wix/README create mode 100644 packaging/wix/files.py create mode 100644 packaging/wix/inkscape.wxs create mode 100644 packaging/wix/install.bat create mode 100644 packaging/wix/next_uuid.py create mode 100644 packaging/wix/wixenv.bat (limited to 'packaging') diff --git a/packaging/wix/README b/packaging/wix/README new file mode 100644 index 000000000..5f1118d7e --- /dev/null +++ b/packaging/wix/README @@ -0,0 +1,19 @@ +howto create windows msi installer + +you need: +1. windows installer XML installed and callable from your path + get it from http://wixtoolset.org/ + the installer is tested using version 3.6 +2. python installed and callable from your path + the installer is tested using version 2.7 + +build the installer +1. build inkscape +2. set environment variables + wixenv.bat +2. create installer using batch + install.bat + +when completed there should be inkscape.msi in your path + + diff --git a/packaging/wix/files.py b/packaging/wix/files.py new file mode 100644 index 000000000..7cddcc6a9 --- /dev/null +++ b/packaging/wix/files.py @@ -0,0 +1,86 @@ +#!/usr/bin/python + + +# list files in directory +import os +import uuid + +directory_ids = {} +file_ids = {} + +def indent(level): + indentstring = '' + for i in range(level): + indentstring += ' ' + return indentstring + +def directory(root, breadcrumb, level): + """ + list all files and directory recursivly + create the file_ids dictionary to be used in ComponentGroup references + """ + global file_ids + global directory_ids + # first list files within directory + files = [ f for f in os.listdir(root) if os.path.isfile(os.path.join(root,f)) ] + for file in files: + file_key = os.path.join(root, file) + _id = '_%06d' % (len(file_ids.keys()) + 1) + file_ids[file_key] = 'component' + _id + wxs.write(indent(level)+ "\n") + wxs.write(indent(level + 1)+ "\n") + wxs.write(indent(level)+ "\n") + # then all directories + + dirs = [ f for f in os.listdir(root) if os.path.isdir(os.path.join(root,f)) ] + for dir in dirs: + directory_key = breadcrumb + '__' + dir + if not directory_key in directory_ids.keys(): + directory_ids[directory_key] = 'dir_%06d' % (len(directory_ids.keys()) + 1) + wxs.write(indent(level) + "\n") + directory(os.path.join(root, dir), directory_key, level + 1) + wxs.write(indent(level) + "\n") + + +def ComponentGroup(name, condition, level): + """ + add componentgroup that contain all items from file_ids that match condition + remove the matched elements from file_ids + """ + global file_ids + keys = [k for k in file_ids.keys() if condition in k] + wxs.write(indent(level) + "\n") + for component in keys: + wxs.write(indent(level + 1) + "\n") + wxs.write(indent(level) + "\n") + for key in keys: + del file_ids[key] + +with open('files.wxs', 'w') as wxs: + wxs.write("\n") + wxs.write("\n") + wxs.write(indent(1) + "\n") + wxs.write(indent(2) + "\n") + wxs.write(indent(2) + "\n") + wxs.write(indent(3) + "\n") + wxs.write(indent(4) + "\n") + print "start parsing ..\..\inkscape" + directory('..\..\inkscape', 'inkscape', 5) + print "found %d files" % len(file_ids.keys()) + wxs.write(indent(4) + "\n") + wxs.write(indent(3) + "\n") + # link to ProgrmMenu + wxs.write(indent(3) + "\n") + wxs.write(indent(4) + "\n") + wxs.write(indent(3) + "\n") + wxs.write(indent(3) + "\n") + wxs.write(indent(2) + "\n") + ComponentGroup("Examples", 'inkscape\\share\\examples', 2) + ComponentGroup("Tutorials", 'inkscape\\share\\tutorials\\', 2) + ComponentGroup("Translations", '\\locale\\', 2) + ComponentGroup("AllOther", '', 2) + wxs.write(indent(1) + "\n") + wxs.write("\n") + + + diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs new file mode 100644 index 000000000..823c54d99 --- /dev/null +++ b/packaging/wix/inkscape.wxs @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/wix/install.bat b/packaging/wix/install.bat new file mode 100644 index 000000000..14596113c --- /dev/null +++ b/packaging/wix/install.bat @@ -0,0 +1,30 @@ +@echo set environment parameter ... +rem call wixenv.bat + +@echo todo implement custom icon and artwork +@echo todo insert files from ../source/release + +@echo call wix compiler ... +candle inkscape.wxs -ext WiXUtilExtension +@if NOT %ERRORLEVEL% == 0 goto theend + +candle files.wxs +@if NOT %ERRORLEVEL% == 0 goto theend + +@echo call wix linker ... +light -ext WixUIExtension -ext WiXUtilExtension inkscape.wixobj files.wixobj -o inkscape.msi +@if NOT %ERRORLEVEL% == 0 goto theend + +@echo the installer is now created +goto theend + +@echo install ... +msiexec /i inkscape.msi /l*v inkscape.log + +pause the program is now installed. press any key to run uninstaller ... +@echo deinstall ... +msiexec /x inkscape.msi + +@echo ... finished + +:theend diff --git a/packaging/wix/next_uuid.py b/packaging/wix/next_uuid.py new file mode 100644 index 000000000..6ed20b506 --- /dev/null +++ b/packaging/wix/next_uuid.py @@ -0,0 +1,10 @@ +import uuid + +""" +a helper script to simply generate some new UUID +""" + +out = open('next_uuid.txt', 'wt') +for i in xrange(10): + out.write(str(uuid.uuid4()) + '\n') + diff --git a/packaging/wix/wixenv.bat b/packaging/wix/wixenv.bat new file mode 100644 index 000000000..85db740df --- /dev/null +++ b/packaging/wix/wixenv.bat @@ -0,0 +1,4 @@ +@echo Setting environment variables for creating msi installer +IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs +IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.6\bin +set PATH=%DEVLIBS_PATH%\python;%WIX_PATH%;%PATH% -- cgit v1.2.3 From 8eb95f1eca12be4d4eac8e5629137c4d54575baf Mon Sep 17 00:00:00 2001 From: Adib Taraben Date: Thu, 15 Nov 2012 23:35:09 +0100 Subject: build files.wxs within install.bat (bzr r11876) --- packaging/wix/install.bat | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packaging') diff --git a/packaging/wix/install.bat b/packaging/wix/install.bat index 14596113c..24d6a81e7 100644 --- a/packaging/wix/install.bat +++ b/packaging/wix/install.bat @@ -4,6 +4,9 @@ rem call wixenv.bat @echo todo implement custom icon and artwork @echo todo insert files from ../source/release +@echo build files.wxs +python files.py + @echo call wix compiler ... candle inkscape.wxs -ext WiXUtilExtension @if NOT %ERRORLEVEL% == 0 goto theend -- cgit v1.2.3 From 13aebdb0895ceae58cc012c8d6efc31fa42a3f49 Mon Sep 17 00:00:00 2001 From: Adib Taraben Date: Wed, 21 Nov 2012 20:39:01 +0100 Subject: wix installer: remove debug information from msi package, add GPL text to license page (bzr r11889) --- packaging/wix/README | 18 ++++-- packaging/wix/files.py | 6 +- packaging/wix/gpl-2.0.rtf | 135 +++++++++++++++++++++++++++++++++++++++++++++ packaging/wix/inkscape.wxs | 4 +- packaging/wix/install.bat | 6 +- 5 files changed, 154 insertions(+), 15 deletions(-) create mode 100644 packaging/wix/gpl-2.0.rtf (limited to 'packaging') diff --git a/packaging/wix/README b/packaging/wix/README index 5f1118d7e..1cb602057 100644 --- a/packaging/wix/README +++ b/packaging/wix/README @@ -4,16 +4,24 @@ you need: 1. windows installer XML installed and callable from your path get it from http://wixtoolset.org/ the installer is tested using version 3.6 -2. python installed and callable from your path - the installer is tested using version 2.7 build the installer 1. build inkscape -2. set environment variables +2. open command shell "cmd" +3. change current directory to inkscape\packaging\wix +4. set environment variables wixenv.bat -2. create installer using batch +5. create installer using batch install.bat when completed there should be inkscape.msi in your path - +things still todo +- detailed explanation what to do for new revisions +- link .svg file names to inkscape +- include some inkscapeish artwork +- better filenames (nightly builds versus releases) +- howto remove python .pyc files after deinstallation +- localisation into the installer + +theAdib diff --git a/packaging/wix/files.py b/packaging/wix/files.py index 7cddcc6a9..a4cf180c3 100644 --- a/packaging/wix/files.py +++ b/packaging/wix/files.py @@ -14,7 +14,7 @@ def indent(level): indentstring += ' ' return indentstring -def directory(root, breadcrumb, level): +def directory(root, breadcrumb, level, exclude=[]): """ list all files and directory recursivly create the file_ids dictionary to be used in ComponentGroup references @@ -22,7 +22,7 @@ def directory(root, breadcrumb, level): global file_ids global directory_ids # first list files within directory - files = [ f for f in os.listdir(root) if os.path.isfile(os.path.join(root,f)) ] + files = [ f for f in os.listdir(root) if os.path.isfile(os.path.join(root,f)) and f not in exclude] for file in files: file_key = os.path.join(root, file) _id = '_%06d' % (len(file_ids.keys()) + 1) @@ -65,7 +65,7 @@ with open('files.wxs', 'w') as wxs: wxs.write(indent(3) + "\n") wxs.write(indent(4) + "\n") print "start parsing ..\..\inkscape" - directory('..\..\inkscape', 'inkscape', 5) + directory('..\..\inkscape', 'inkscape', 5, ['inkscape.dbg', 'inkview.dbg', 'gdb.exe']) print "found %d files" % len(file_ids.keys()) wxs.write(indent(4) + "\n") wxs.write(indent(3) + "\n") diff --git a/packaging/wix/gpl-2.0.rtf b/packaging/wix/gpl-2.0.rtf new file mode 100644 index 000000000..870d1c819 --- /dev/null +++ b/packaging/wix/gpl-2.0.rtf @@ -0,0 +1,135 @@ +{\rtf1\ansi\uc1\deff13\deflang1024 +{\fonttbl{\f0\fnil\fcharset0 Zapf Chancery;} +{\f1\fnil\fcharset204 Zapf Chancery;} +{\f2\fnil\fcharset204 Times;} +{\f3\fnil\fcharset204 Helvetica;} +{\f4\fnil\fcharset204 Helvetica;} +{\f5\fnil\fcharset204 Courier;} +{\f6\fnil\fcharset2 Symbol;} +{\f7\fnil\fcharset0 MT Extra;} +{\f8\fnil\fcharset238 Zapf Chancery;} +{\f9\fnil\fcharset238 Times;} +{\f10\fnil\fcharset238 Helvetica;} +{\f11\fnil\fcharset238 Helvetica;} +{\f12\fnil\fcharset238 Courier;} +{\f13\fnil\fcharset0 Times;} +{\f14\fnil\fcharset0 Helvetica;} +{\f15\fnil\fcharset0 Helvetica;} +{\f16\fnil\fcharset0 Courier;} +} +{\colortbl; +\red0\green0\blue0; +\red0\green0\blue255; +\red0\green255\blue255; +\red0\green255\blue0; +\red255\green0\blue255; +\red255\green0\blue0; +\red255\green255\blue0; +\red255\green255\blue255; +\red0\green0\blue128; +\red0\green128\blue128; +\red0\green128\blue0; +\red128\green0\blue128; +\red128\green0\blue0; +\red128\green128\blue0; +\red128\green128\blue128; +\red192\green192\blue192; +} +{\stylesheet +{\s0\fs20\snext0 Normal;} +{\s2\ql\sb240\sa60\keepn\f13\b\fs40 \sbasedon0\snext0 heading 1;} +{\s2\ql\sb240\sa60\keepn\f13\b\fs40\li0 \sbasedon0\snext0 heading 1;} +{\s1\ql\sb240\sa60\keepn\f13\b\fs40\li0 \sbasedon0\snext0 heading 1;} +{\s6\ql\sb240\sa60\keepn\f13\b\fs24\li2048 \sbasedon0\snext0 heading 5;} +{\s3\ql\sb240\sa60\keepn\f13\b\fs32\li512 \sbasedon0\snext0 heading 2;} +{\s7\ql\sb240\sa60\keepn\f13\b\fs24\li2560 \sbasedon0\snext0 heading 6;} +{\s4\ql\sb240\sa60\keepn\f13\b\fs32\li1024 \sbasedon0\snext0 heading 3;} +{\s5\ql\sb240\sa60\keepn\f13\b\fs24\li1536 \sbasedon0\snext0 heading 4;} +{\s6\ql\sb240\sa60\keepn\f13\b\fs24 \sbasedon0\snext0 heading 5;} +{\s1\qc\sb240\sa60\keepn\f13\b\fs40 \sbasedon0\snext0 part;} +{\s3\ql\sb240\sa60\keepn\f13\b\fs32 \sbasedon0\snext0 heading 2;} +{\s7\ql\sb240\sa60\keepn\f13\b\fs24 \sbasedon0\snext0 heading 6;} +{\s4\ql\sb240\sa60\keepn\f13\b\fs32 \sbasedon0\snext0 heading 3;} +{\s5\ql\sb240\sa60\keepn\f13\b\fs24 \sbasedon0\snext0 heading 4;} +} +{\info +{\title Original file was gpl-2.0.tex} +{\doccomm Created using latex2rtf 1.9.19 (released Nov 20 2007) on Wed Nov 21 17:05:20 2012 +} +} +{\footer\pard\plain\f13\fs22\qc\chpgn\par} +\paperw12280\paperh15900\margl2680\margr2700\margt2540\margb1760\pgnstart0\widowctrl\qj\ftnbj\f13\aftnnar +{ +\par\pard\qc {\fs30 \pard\qc\sl240\slmult1 \fi340 GNU GENERAL PUBLIC LICENSE} +\par\pard\qc {\fs24 } +\par\pard\qc {\fs24 } +\par\pard\qc {\fs24 Version 2, June 1991} +\par\pard\qc {\fs24 }\par +{\pard\qc\sl240\slmult1 \fi0 {\par +\pard\qc\sl240\slmult1 \fi0 Copyright \'a9 1989, 1991 Free Software Foundation, Inc.\par +\pard\qc\sl240\slmult1 \sb240 \fi0 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\par +\pard\qc\sl240\slmult1 \sb240 \fi0 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. } \par +}{\pard\qc\sl240\slmult1 \fi0 {\i0\scaps0\b \fs26 Preamble} \par +}\pard\qj\sl240\slmult1 \fi0 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software\emdash to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation\rquote s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.\par +\pard\qj\sl240\slmult1 \fi0 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\par +\pard\qj\sl240\slmult1 \fi0 To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\par +\pard\qj\sl240\slmult1 \fi0 For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\par +\pard\qj\sl240\slmult1 \fi0 We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.\par +\pard\qj\sl240\slmult1 \fi0 Also, for each author\rquote s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors\rquote reputations.\par +\pard\qj\sl240\slmult1 \fi0 Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone\rquote s free use or not licensed at all.\par +\pard\qj\sl240\slmult1 \fi0 The precise terms and conditions for copying, distribution and modification follow.\par +{\pard\qc\sl240\slmult1 \fi0 {\fs31 \i0\b0\scaps Terms and Conditions For Copying, Distribution and Modification} \par +}{\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 1.\tab This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The \ldblquote Program\rdblquote , below, refers to any such program or work, and a \ldblquote work based on the Program\rdblquote means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term \ldblquote modification\rdblquote .) Each licensee is addressed as \ldblquote you\rdblquote .\par +\pard\qj\sl240\slmult1 \li600\fi0 Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 2.\tab You may copy and distribute verbatim copies of the Program\rquote s source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\par +\pard\qj\sl240\slmult1 \li600\fi0 You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 3.\tab You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\par +{\pard\qj\sl240\slmult1 \sb50 \li1200\fi-300 (a)\tab You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\par +\pard\qj\sl240\slmult1 \sb50 \li1200\fi-300 (b)\tab You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.\par +\pard\qj\sl240\slmult1 \sb50 \li1200\fi-300 (c)\tab If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)\par +}\pard\qj\sl240\slmult1 \sb100 \li600\fi0 These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\par +\pard\qj\sl240\slmult1 \li600\fi-300 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\par +\pard\qj\sl240\slmult1 \li600\fi-300 In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 4.\tab You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\par +{\pard\qj\sl240\slmult1 \sb50 \li1200\fi-300 (a)\tab Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par +\pard\qj\sl240\slmult1 \sb50 \li1200\fi-300 (b)\tab Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par +\pard\qj\sl240\slmult1 \sb50 \li1200\fi-300 (c)\tab Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)\par +}\pard\qj\sl240\slmult1 \sb100 \li600\fi0 The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\par +\pard\qj\sl240\slmult1 \li600\fi-300 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 5.\tab You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 6.\tab You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 7.\tab Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients\rquote exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 8.\tab If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\par +\pard\qj\sl240\slmult1 \li600\fi0 If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\par +\pard\qj\sl240\slmult1 \li600\fi0 It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\par +\pard\qj\sl240\slmult1 \li600\fi0 This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 9.\tab If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 10.\tab The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par +\pard\qj\sl240\slmult1 \li600\fi0 Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and \ldblquote any later version\rdblquote , you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 11.\tab If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\par +{\pard\qc\sl240\slmult1 \li600\fi0 {\fs31 \i0\b0\scaps No Warranty } \par +}\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 12.\tab {\i0\b0\scaps Because the program is licensed free of charge, there is no warranty for the program, to the extent permitted by applicable law. Except when otherwise stated in writing the copyright holders and/or other parties provide the program \ldblquote as is\rdblquote without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the program is with you. Should the program prove defective, you assume the cost of all necessary servicing, repair or correction.}\par +\pard\qj\sl240\slmult1 \sb50 \li600\fi-300 13.\tab {\i0\b0\scaps In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who may modify and/or redistribute the program as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the program to operate with any other programs), even if such holder or other party has been advised of the possibility of such damages.}\par +}{\pard\qc\sl240\slmult1 \sb100 \fi0 {\fs31 \i0\b0\scaps End of Terms and Conditions} \par +}\page{}\pard\qj\sl240\slmult1 \fi0 [2]\par +\pard\qj\sl240\slmult1 \sb240 \fi0 {\s3\ql\sb240\sa60\keepn\f13\b\fs32 Appendix: How to Apply These Terms to Your New Programs\par +}\pard\qj\sl240\slmult1 \sb60 \fi0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par +\pard\qj\sl240\slmult1 \fi0 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the \ldblquote copyright\rdblquote line and a pointer to where the full notice is found.\par +{\pard\qj\sl240\slmult1 \sb60 \li512\ri512\fi0 one line to give the program\rquote s name and a brief idea of what it does. \par +\pard\qj\sl240\slmult1 \li512\ri512\fi0 Copyright (C) yyyy name of author \par +\pard\qj\sl240\slmult1 \li512\ri512\fi0 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\par +\pard\qj\sl240\slmult1 \li512\ri512\fi0 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\par +\pard\qj\sl240\slmult1 \li512\ri512\fi0 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. \par +}\pard\qj\sl240\slmult1 \sb60 \fi0 Also add information on how to contact you by electronic and paper mail.\par +\pard\qj\sl240\slmult1 \fi0 If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\par +{\pard\qj\sl240\slmult1 \sb60 \li512\ri512\fi0 Gnomovision version 69, Copyright (C) yyyy name of author \par +\pard\qj\sl240\slmult1 \li512\ri512\fi0 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type \lquote show w\rquote . \par +\pard\qj\sl240\slmult1 \li512\ri512\fi0 This is free software, and you are welcome to redistribute it under certain conditions; type \lquote show c\rquote for details. \par +}\pard\qj\sl240\slmult1 \sb60 \fi0 The hypothetical commands {\i0\scaps0\b0\f16 show w} and {\i0\scaps0\b0\f16 show c} should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than {\i0\scaps0\b0\f16 show w} and {\i0\scaps0\b0\f16 show c}; they could even be mouse-clicks or menu items\emdash whatever suits your program.\par +\pard\qj\sl240\slmult1 \fi0 You should also get your employer (if you work as a programmer) or your school, if any, to sign a \ldblquote copyright disclaimer\rdblquote for the program, if necessary. Here is a sample; alter the names:\par +{\pard\qj\sl240\slmult1 \sb60 \li512\ri512\fi0 Yoyodyne, Inc., hereby disclaims all copyright interest in the program \par +\pard\qj\sl240\slmult1 \li512\ri512\fi0 \lquote Gnomovision\rquote (which makes passes at compilers) written by James Hacker. \par +\pard\qj\sl240\slmult1 \li512\ri512\fi0 signature of Ty Coon, 1 April 1989 \par +\pard\qj\sl240\slmult1 \li512\ri512\fi0 Ty Coon, President of Vice \par +}\pard\qj\sl240\slmult1 \sb60 \fi0 This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.\par +}} diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs index 823c54d99..215f34001 100644 --- a/packaging/wix/inkscape.wxs +++ b/packaging/wix/inkscape.wxs @@ -1,6 +1,6 @@ - + @@ -67,7 +67,7 @@ --> - + diff --git a/packaging/wix/install.bat b/packaging/wix/install.bat index 24d6a81e7..f8bb120f0 100644 --- a/packaging/wix/install.bat +++ b/packaging/wix/install.bat @@ -1,8 +1,3 @@ -@echo set environment parameter ... -rem call wixenv.bat - -@echo todo implement custom icon and artwork -@echo todo insert files from ../source/release @echo build files.wxs python files.py @@ -19,6 +14,7 @@ light -ext WixUIExtension -ext WiXUtilExtension inkscape.wixobj files.wixobj -o @if NOT %ERRORLEVEL% == 0 goto theend @echo the installer is now created +@rem uncomment following line if you want to test the installer goto theend @echo install ... -- cgit v1.2.3 From 838c6fceda92d460b45d6a856a3c8c9a63ac8b0e Mon Sep 17 00:00:00 2001 From: Adib Taraben Date: Thu, 22 Nov 2012 00:25:35 +0100 Subject: wix installer: assign svg file extension to inkscape (bzr r11891) --- packaging/wix/README | 1 - packaging/wix/files.py | 3 +++ packaging/wix/inkscape.wxs | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/wix/README b/packaging/wix/README index 1cb602057..2046797ca 100644 --- a/packaging/wix/README +++ b/packaging/wix/README @@ -18,7 +18,6 @@ when completed there should be inkscape.msi in your path things still todo - detailed explanation what to do for new revisions -- link .svg file names to inkscape - include some inkscapeish artwork - better filenames (nightly builds versus releases) - howto remove python .pyc files after deinstallation diff --git a/packaging/wix/files.py b/packaging/wix/files.py index a4cf180c3..93a7c8dd1 100644 --- a/packaging/wix/files.py +++ b/packaging/wix/files.py @@ -28,6 +28,9 @@ def directory(root, breadcrumb, level, exclude=[]): _id = '_%06d' % (len(file_ids.keys()) + 1) file_ids[file_key] = 'component' + _id wxs.write(indent(level)+ "\n") + if file == 'inkscape.exe': + # we refenrence inkscape.exe in inkscape.wxs + _id = '_inkscape_exe' wxs.write(indent(level + 1)+ "\n") wxs.write(indent(level)+ "\n") # then all directories diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs index 215f34001..e2bc26462 100644 --- a/packaging/wix/inkscape.wxs +++ b/packaging/wix/inkscape.wxs @@ -32,6 +32,21 @@ + + + + + + + + + + + @@ -40,17 +55,26 @@ --> + + + + + + + -- cgit v1.2.3 From 2983c4daf2cbd7869e941f1aad405f958d2cada9 Mon Sep 17 00:00:00 2001 From: Adib Taraben Date: Mon, 26 Nov 2012 00:09:19 +0100 Subject: wix installer: added artwork (from nsis) - now needs wix 3.7 (bzr r11897) --- packaging/wix/Bitmaps/banner.bmp | Bin 0 -> 85894 bytes packaging/wix/Bitmaps/banner.svg | 532 +++++++ packaging/wix/Bitmaps/dialog.bmp | Bin 0 -> 461814 bytes packaging/wix/Bitmaps/dialog.svg | 2918 ++++++++++++++++++++++++++++++++++++++ packaging/wix/README | 3 +- packaging/wix/inkscape.wxs | 15 +- packaging/wix/wixenv.bat | 17 +- 7 files changed, 3477 insertions(+), 8 deletions(-) create mode 100644 packaging/wix/Bitmaps/banner.bmp create mode 100644 packaging/wix/Bitmaps/banner.svg create mode 100644 packaging/wix/Bitmaps/dialog.bmp create mode 100644 packaging/wix/Bitmaps/dialog.svg (limited to 'packaging') diff --git a/packaging/wix/Bitmaps/banner.bmp b/packaging/wix/Bitmaps/banner.bmp new file mode 100644 index 000000000..cc05de072 Binary files /dev/null and b/packaging/wix/Bitmaps/banner.bmp differ diff --git a/packaging/wix/Bitmaps/banner.svg b/packaging/wix/Bitmaps/banner.svg new file mode 100644 index 000000000..df0d0df8f --- /dev/null +++ b/packaging/wix/Bitmaps/banner.svg @@ -0,0 +1,532 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/wix/Bitmaps/dialog.bmp b/packaging/wix/Bitmaps/dialog.bmp new file mode 100644 index 000000000..0e015ceb9 Binary files /dev/null and b/packaging/wix/Bitmaps/dialog.bmp differ diff --git a/packaging/wix/Bitmaps/dialog.svg b/packaging/wix/Bitmaps/dialog.svg new file mode 100644 index 000000000..e03cbb46d --- /dev/null +++ b/packaging/wix/Bitmaps/dialog.svg @@ -0,0 +1,2918 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/wix/README b/packaging/wix/README index 2046797ca..f40e104e7 100644 --- a/packaging/wix/README +++ b/packaging/wix/README @@ -3,7 +3,7 @@ howto create windows msi installer you need: 1. windows installer XML installed and callable from your path get it from http://wixtoolset.org/ - the installer is tested using version 3.6 + Because of a bug in the current version of wix the installer works using version 3.7 only. build the installer 1. build inkscape @@ -18,7 +18,6 @@ when completed there should be inkscape.msi in your path things still todo - detailed explanation what to do for new revisions -- include some inkscapeish artwork - better filenames (nightly builds versus releases) - howto remove python .pyc files after deinstallation - localisation into the installer diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs index e2bc26462..6e99c2175 100644 --- a/packaging/wix/inkscape.wxs +++ b/packaging/wix/inkscape.wxs @@ -26,7 +26,8 @@ - + + @@ -38,11 +39,10 @@ - + @@ -91,11 +91,16 @@ --> + + + + + - - + + diff --git a/packaging/wix/wixenv.bat b/packaging/wix/wixenv.bat index 85db740df..5f1f7e90c 100644 --- a/packaging/wix/wixenv.bat +++ b/packaging/wix/wixenv.bat @@ -1,4 +1,19 @@ @echo Setting environment variables for creating msi installer + +@echo detect OS version +ver | findstr /i "6\.1\." > nul +IF %ERRORLEVEL% EQU 0 goto win7 + +@rem all other cases +IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.7\bin IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs -IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.6\bin +goto setpath + +:win7 +IF "%WIX_PATH%"=="" set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.7\bin +IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs + +:setpath set PATH=%DEVLIBS_PATH%\python;%WIX_PATH%;%PATH% + +:end -- cgit v1.2.3 From 4bd71062cce91cc63c2173f2b7a562043051ca40 Mon Sep 17 00:00:00 2001 From: Adib Taraben Date: Tue, 4 Dec 2012 08:09:46 +0100 Subject: wix installer: create msi filename from version sing in src/inkscape.rc, add wix files to dist target (bzr r11929) --- packaging/wix/inkscape.wxs | 12 +++++++----- packaging/wix/install.bat | 9 ++++++--- packaging/wix/version.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 packaging/wix/version.py (limited to 'packaging') diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs index 6e99c2175..dfe61defd 100644 --- a/packaging/wix/inkscape.wxs +++ b/packaging/wix/inkscape.wxs @@ -1,18 +1,20 @@ - + + + - + @@ -27,7 +29,7 @@ - + @@ -49,7 +51,7 @@ - + \n") + wxi.write("\n") + wxi.write("\n") + wxi.write("\n") + wxi.write("\n") + + + -- cgit v1.2.3