diff --git a/ChangeLog b/ChangeLog index e609908..b7320e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ # Version number followed by the release date +1.3.0.0 2020/08/15 + * Link against wxWidgets 3.0 + * SSE2 compatible CPUs are required (xerces-c++) + 1.2.1.5 - * Use the same default encoding to read and write file (Bug #234) + * Use the same default encoding to read and write files (Bug #234) * Only show SSE2 warning in debug build * Bug #228 Misleading translation when file was changed externally, may lead to data loss * Bug #227 Dead Link: Help > Forum diff --git a/configure b/configure index d60d076..6df82be 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xmlcopyeditor 1.2.1.5. +# Generated by GNU Autoconf 2.69 for xmlcopyeditor 1.3.0.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xmlcopyeditor' PACKAGE_TARNAME='xmlcopyeditor' -PACKAGE_VERSION='1.2.1.5' -PACKAGE_STRING='xmlcopyeditor 1.2.1.5' +PACKAGE_VERSION='1.3.0.0' +PACKAGE_STRING='xmlcopyeditor 1.3.0.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1398,7 +1398,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xmlcopyeditor 1.2.1.5 to adapt to many kinds of systems. +\`configure' configures xmlcopyeditor 1.3.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1469,7 +1469,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xmlcopyeditor 1.2.1.5:";; + short | recursive ) echo "Configuration of xmlcopyeditor 1.3.0.0:";; esac cat <<\_ACEOF @@ -1604,7 +1604,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xmlcopyeditor configure 1.2.1.5 +xmlcopyeditor configure 1.3.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2177,7 +2177,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xmlcopyeditor $as_me 1.2.1.5, which was +It was created by xmlcopyeditor $as_me 1.3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3043,7 +3043,7 @@ fi # Define the identity of the package. PACKAGE='xmlcopyeditor' - VERSION='1.2.1.5' + VERSION='1.3.0.0' cat >>confdefs.h <<_ACEOF @@ -6870,7 +6870,7 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} @@ -7371,11 +7371,8 @@ _LT_EOF test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -8594,8 +8591,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 + echo "$AR cr libconftest.a conftest.o" >&5 + $AR cr libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -9733,6 +9730,12 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -13675,7 +13678,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -14167,7 +14170,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -14232,7 +14235,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -14571,7 +14574,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -14655,7 +14658,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -14666,7 +14669,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' @@ -17902,7 +17905,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xmlcopyeditor $as_me 1.2.1.5, which was +This file was extended by xmlcopyeditor $as_me 1.3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17959,7 +17962,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xmlcopyeditor config.status 1.2.1.5 +xmlcopyeditor config.status 1.3.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8847505..0e384ff 100755 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([xmlcopyeditor], [1.2.1.5]) +AC_INIT([xmlcopyeditor], [1.3.0.0]) AC_CONFIG_SRCDIR([src/xmlcopyeditor.cpp]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index 54ebc66..11f0ca1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +xmlcopyeditor (1.3.0.0-1) unstable; urgency=low + + * Link against wxWidgets 3.0 + * SSE2 compatible CPUs are required (xerces-c++) + * Use the same default encoding to read and write files (Bug #234) + * Only show SSE2 warning in debug build + * Bug #228 Misleading translation when file was changed externally, may lead + to data loss + * Bug #227 Dead Link: Help > Forum + * Bug #221 Patch for building with C++11 (Roger Leigh) + + Added Mac port + * Update the iconized frame window when opening files from the command line + * Fix supporting for filenames with non-ASCII characters + + Feature #171 Fold element does not fold following whitespace + + Feature #170 I did a small patch that allows SPACE to trigger + autocompletion on any space (Thanassis Tsiodras) + + -- Zane U. Ji Tue, 18 Aug 2020 22:15:48 +0800 + xmlcopyeditor (1.2.1.3-1) unstable; urgency=low * Fixed problems with new documents @@ -5,7 +24,8 @@ xmlcopyeditor (1.2.1.3-1) unstable; urgency=low * Bug #211 Tag-completion remains on-top when XML-Copy-Editor looses focus * Keep the original format when associating a DTD/schema/XSL + Added a manual - - Stopped installing copyright notices of components that are not installed by us + - Stopped installing copyright notices of components that are not installed + by us + Feature #169 Close current tab with Ctrl+W -- Zane U. Ji Sat, 06 Sep 2014 09:47:43 +0800 diff --git a/src/xmlcopyeditor.rc b/src/xmlcopyeditor.rc index d099287..38a245a 100644 --- a/src/xmlcopyeditor.rc +++ b/src/xmlcopyeditor.rc @@ -175,8 +175,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,1,5 - PRODUCTVERSION 1,2,1,5 + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -195,7 +195,7 @@ BEGIN VALUE "FileDescription", "XML Copy Editor is a fast, free, validating XML editor" VALUE "FileVersion", "" VALUE "InternalName", "xmlcopyeditor.exe" - VALUE "LegalCopyright", "Copyright (c) 2018 Gerald Schmidt" + VALUE "LegalCopyright", "Copyright (c) 2020 Gerald Schmidt" VALUE "OriginalFilename", "XmlCopyEditor.exe" VALUE "ProductName", "XML Copy Editor" VALUE "ProductVersion", "" diff --git a/src/xmlcopyeditorcopy.h b/src/xmlcopyeditorcopy.h index 7fa5651..3ed87ff 100644 --- a/src/xmlcopyeditorcopy.h +++ b/src/xmlcopyeditorcopy.h @@ -24,7 +24,7 @@ #else #define FILE_FILTER _("All files (*)|*|XML (*.xml)|*.xml|XHTML (*.html)|*.html|DTD (*.dtd)|*.dtd|XML Schema (*.xsd)|*.xsd|RELAX NG grammar (*.rng)|*.rng|XSL (*.xsl)|*.xsl") #endif -#define ABOUT_COPYRIGHT _("Copyright © 2005-2018 Gerald Schmidt ") +#define ABOUT_COPYRIGHT _("Copyright © 2005-2020 Gerald Schmidt ") #define ABOUT_DESCRIPTION _("\nXML Copy Editor is free software released under the GNU\nGeneral Public License.\n\nMany thanks are due to ") #define ABOUT_CONTRIBUTORS _T(\ "Tim van Niekerk, Matt Smigielski,\n"\ @@ -52,7 +52,7 @@ "License along with this program; if not, write to the Free\n"\ "Software Foundation, Inc., 59 Temple Place, Suite 330,\n"\ "Boston, MA 02111-1307 USA.") -#define ABOUT_VERSION _T("1.2.1.5") +#define ABOUT_VERSION _T("1.3.0.0") #define XMLCE_VAR _T("XMLCE_VAR") #ifdef __WXMSW__