diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..5a7725df3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +/dist +dpan/dpan/authors/id/D/DP/DPAN/*.tar.gz +dpan/dpan/authors/id/D/DP/DPAN/*.tar.gz.patched +!dpan/dpan/authors/id/D/DP/DPAN/.gitkeep +extensions +/local_install +/local_www +/Treex-PML +/unix_install +/virtualenv +win32_strawberry/perl/* +!win32_strawberry/perl/.gitkeep +/win32_strawberry/*.exe +/unix_install_pkgs/deb/tred_3* +/unix_install_pkgs/rpm/tred-3* +/dpan/dpan/indexing_log +/admin/7zExtra \ No newline at end of file diff --git a/Makefile b/Makefile index 9cb05c7db..b9cbac436 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,7 @@ make-changelog: # - TrEd version number (based on SVN revision) # - compile the documentation from DocBook and POD (tred/devel/make_manual) # - updated extensions dir (SVN working copy) -update-dist-dir: make-changelog +update-dist-dir: make-changelog extensions cd admin && ./update-dist-dir.sh @@ -184,3 +184,10 @@ compile-treex-pml-dist: install-treex-pml: cd admin && ./install-treex-pml.sh + + +#### Extensions repository +extensions: + GIT_DIR=`pwd` && \ + . admin/env.sh && \ + git clone $${TRED_GIT_EXT} $${TRED_EXT_DIR} \ No newline at end of file diff --git a/admin/create_installer_with_strawberry_perl.sh b/admin/create_installer_with_strawberry_perl.sh index 561a60aca..c106bf7b4 100755 --- a/admin/create_installer_with_strawberry_perl.sh +++ b/admin/create_installer_with_strawberry_perl.sh @@ -13,7 +13,7 @@ function get_strawberry() { } if [ -z "$VER" ]; then - VER=`$DIST_DIR/tred/devel/update_version.pl -n ${TRED_SVN_REPO}` + VER=`$DIST_DIR/tred/devel/update_version.pl -n` fi diff --git a/admin/create_tred_packages.sh b/admin/create_tred_packages.sh index e6701121f..a8cb0a293 100755 --- a/admin/create_tred_packages.sh +++ b/admin/create_tred_packages.sh @@ -22,7 +22,7 @@ WWW="$3" SFX=$(dirname $0)/7zExtra/7zS.sfx if [ -z "$VER" ]; then - VER=`$DIST_DIR/tred/devel/update_version.pl -n ${TRED_SVN_REPO}` + VER=`$DIST_DIR/tred/devel/update_version.pl -n` fi cd "$DIST_DIR" @@ -33,7 +33,7 @@ PKG="tred-current.tar.gz" DATE="$(LANG=C date)" # update revision numbers in tred source tree -perl -pi -e 's/our \$VERSION = "SVN_VERSION"/our \$VERSION = "'$VER'"/g' tred/tredlib/TrEd/Version.pm +perl -pi -e 's/our \$VERSION = "DEV_VERSION"/our \$VERSION = "'$VER'"/g' tred/tredlib/TrEd/Version.pm # update revision numbers in index.html perl -pi~ -e "s/tred-(?:current|[0-9.]+?)\\.tar\\.gz/${PKG}/g; s/Current version:.*/dev/null -DMG_FILE="tred_2.${SVN_VERSION}.dmg" +DMG_FILE="tred_3.${GIT_DATE}.dmg" cp "${TREDWWW}/tred/tred.dmg" "${TREDWWW}/tred/releases/osx/$DMG_FILE" \ No newline at end of file diff --git a/admin/mac_prepare.sh b/admin/mac_prepare.sh index acc98595c..76194514f 100755 --- a/admin/mac_prepare.sh +++ b/admin/mac_prepare.sh @@ -9,6 +9,6 @@ scp ${WWW}/tred/tred-current.tar.gz $MAC_RELEASER:$MAC_TRED_INSTALLATION scp ${WWW}/tred/tred-dep-unix.tar.gz $MAC_RELEASER:$MAC_TRED_INSTALLATION ssh $MAC_RELEASER <> $LOG && \ +echo "Updating git..." && \ +git pull >> $LOG && \ echo "done" && \ - -# find the current revision number of svn -# LAST_COMMIT_NO=`svn info ${TRED_SRC_DIR} | grep "Revision:" | cut -d ':' -f 2 | cut -d ' ' -f 2` && \ -# -# if [ -a ${TRED_SRC_DIR}/ChangeLog ]; then -# # if ChangeLog exists, we should update it only if it does not already contain the last revision -# LAST_COMMIT_IN_CHANGELOG=`grep -c "r$LAST_COMMIT_NO" ${TRED_SRC_DIR}/ChangeLog` -# else -# # if ChangeLog does not exist, it needs to be created -# LAST_COMMIT_IN_CHANGELOG=0 -# fi && \ - -## echo "LAST_COMMIT_NO = $LAST_COMMIT_NO" -## echo "LAST_COMMIT_IN_CHANGELOG = $LAST_COMMIT_IN_CHANGELOG" - -# if [ "$LAST_COMMIT_IN_CHANGELOG" == 0 ]; then - echo "Transforming svn log --> ChangeLog (this takes a while)..." && \ - cd ${TRED_SRC_DIR} && ${SVN_TO_CHANGELOG} --include-rev -o ChangeLog && \ -# else -# echo "ChangeLog is already up to date." -# fi && \ +echo "Transforming git log --> ChangeLog (this takes a while)..." && \ +cd ${TRED_SRC_DIR} && ${GIT_TO_CHANGELOG} > ChangeLog && \ echo "Done" diff --git a/admin/prepare-tred-web-release.sh b/admin/prepare-tred-web-release.sh index 317b20289..e38cbc623 100755 --- a/admin/prepare-tred-web-release.sh +++ b/admin/prepare-tred-web-release.sh @@ -22,9 +22,9 @@ cp -f ${TRED_DIST_DIR}/documentation/refactoring/TrEd_refactoring.pdf ${WWW}/tre ##change urls in index.html to point to the directory of that index, should be changed when there is another place for TrEd xsh2 -P ${WWW}/tred/index.html 'nobackups; rm //*[@class="offline"]; map :i { s{^TRED_HOME_URL/}{} } //@href;' && \ -# Fix SVN version in links and text... -SVN_VERSION=`svn info . | grep 'Revision:' | sed -E 's/[^0-9]+//g'` -sed -i "s/(SVN:VERSION)/$SVN_VERSION/g" ${WWW}/tred/index.html +# Fix git date version in links and text... +GIT_DATE=`git log -1 --date=format:"%Y%m%d" --format="%ad"|tr -d "\n"` +sed -i "s/(GIT:DATE)/$GIT_DATE/g" ${WWW}/tred/index.html ##ATT if we want ActivePerl ppm packages # we need to run win32_ppm/get_packages_tred_58 a get_packages_tred_510.sh before this is run diff --git a/admin/prereq.sh b/admin/prereq.sh index a62331e4f..4d648d669 100755 --- a/admin/prereq.sh +++ b/admin/prereq.sh @@ -27,37 +27,6 @@ function perl_module_presence_and_version_test { fi } -# This funcition downloads current version of svn2cl script from web, -# compares its MD5 sum to the MD5 sum found on the web and -# unpacks it, if the MD5 sum is correct -function get_svn2cl { - ### svn2cl - SVN2CL_URL="https://arthurdejong.org/svn2cl/" - SVN2CL_FILE_DL="svn2cl.tar.gz" - wget ${SVN2CL_URL}downloads.html -O web >> $LOG - - NEWEST_SVN2CL=`grep -o "svn2cl-[0-9.]\+tar.gz" web | head -n 1` - wget -nv ${SVN2CL_URL}${NEWEST_SVN2CL} -O $SVN2CL_FILE_DL >> $LOG - wget -nv ${SVN2CL_URL}${NEWEST_SVN2CL}.md5 -O ${SVN2CL_FILE_DL}.md5 >> $LOG - - SVN2CL_MD5_WEB=`cut -d ' ' -f 1 $SVN2CL_FILE_DL.md5` - SVN2CL_MD5_LOCAL=`md5sum $SVN2CL_FILE_DL | cut -d ' ' -f 1` - - if [ "$SVN2CL_MD5_WEB" == "$SVN2CL_MD5_LOCAL" ]; then - echo "MD5 sum ok, extracting svn2cl.." - tar xvzf $SVN2CL_FILE_DL -C $ADMIN_DIR - # remove the version of the svn2cl from dir name - mv ${ADMIN_DIR}/svn2cl*/ ${ADMIN_DIR}/svn2cl - echo "done" - else - echo "MD5 sum error, please download and unpack svn2cl to dir $ADMIN_DIR/svn2cl manually..." - exit 1; - fi - rm $SVN2CL_FILE_DL - rm -f web - rm -f ${SVN2CL_FILE_DL}.md5 -} - # This function downloads 7zip and unpacks it, if the MD5 sum of the downloaded # package is correct function get_7zExtra { @@ -124,10 +93,16 @@ else fi -if [ -x "$SVN_TO_CHANGELOG" ]; then - echo "svn2cl found, OK." +if [ ! -x "$PYTHON_ENV/bin/activate" ]; then + python -m venv ${PYTHON_ENV} +fi +. ${PYTHON_ENV}/bin/activate + + +if [ -x "$GIT_TO_CHANGELOG" ]; then + echo "git-changelog found, OK." else - get_svn2cl + pip install git-changelog fi BIN_7Z=`which 7z` @@ -209,16 +184,10 @@ else echo "Done" fi -## create or update unix_install directory -if [ -d "$TRED_UNIXINST_DIR" ]; then - cd $TRED_UNIXINST_DIR - echo "Updating unix_install checkout directory" - svn up >> $LOG - echo "Done" -else - echo "No directory unix_install found, creating a new one and making a fresh checkout" - mkdir $TRED_UNIXINST_DIR 2>/dev/null - svn co $TRED_SVN_REPO/devel/unix_install $TRED_UNIXINST_DIR >> $LOG - echo "Done" -fi - +## create unix_install directory +echo "remove and create unix_install checkout directory" +rm -rf "$TRED_UNIXINST_DIR" +git -C ${TRED_SRC_DIR}/devel/unix_install archive --output $TRED_UNIXINST_DIR.zip HEAD >> $LOG +unzip ${TRED_UNIXINST_DIR}.zip -d ${TRED_UNIXINST_DIR} >> $LOG && \ +rm ${TRED_UNIXINST_DIR}.zip && \ +echo "Done" \ No newline at end of file diff --git a/admin/release-deb.sh b/admin/release-deb.sh index 9b49c883b..2095018bf 100755 --- a/admin/release-deb.sh +++ b/admin/release-deb.sh @@ -6,7 +6,7 @@ EXTDIR=`dirname $(readlink -fen $0)` . $EXTDIR/env.sh -SVN_VERSION=`svn info . | grep 'Revision:' | sed -E 's/[^0-9]+//g'` +GIT_DATE=`git log -1 --date=format:"%Y%m%d" --format="%ad"|tr -d "\n"` # Prepare the deb package cd "$PROJECT_DIR/unix_install_pkgs/deb" || exit 1 @@ -14,7 +14,7 @@ cd "$PROJECT_DIR/unix_install_pkgs/deb" || exit 1 # Copying the package to the local www echo "Copying the package to local www ..." -DEB_FILE="tred_2.${SVN_VERSION}_all.deb" +DEB_FILE="tred_3.${GIT_DATE}_all.deb" cp "./${DEB_FILE}" "${TREDWWW}/tred/${DEB_FILE}" d=`pwd` cd "${TREDWWW}/tred/" @@ -29,7 +29,7 @@ ssh ${LOGIN_NAME}@${TESTING_SERVER} "rm -f /var/www/tred/testbed/*.deb" # Upload the package to the testbed website echo "Uploading the package to testbed web ..." -DEB_FILE="tred_2.${SVN_VERSION}_all.deb" +DEB_FILE="tred_3.${GIT_DATE}_all.deb" scp "./${DEB_FILE}" "${LOGIN_NAME}@${REMOTE_WWW}/${DEB_FILE}" # Make sure tred.deb link points to the newest deb package diff --git a/admin/release-rpm.sh b/admin/release-rpm.sh index 00ec19836..a19408948 100755 --- a/admin/release-rpm.sh +++ b/admin/release-rpm.sh @@ -6,7 +6,7 @@ EXTDIR=`dirname $(readlink -fen $0)` . $EXTDIR/env.sh -SVN_VERSION=`svn info . | grep 'Revision:' | sed -E 's/[^0-9]+//g'` +GIT_DATE=`git log -1 --date=format:"%Y%m%d" --format="%ad"|tr -d "\n"` # Prepare the deb package cd "$PROJECT_DIR/unix_install_pkgs/rpm" || exit 1 @@ -24,7 +24,7 @@ for DISTRO in $DISTROS; do echo "... for $DISTRO ..." d=`pwd` cd "${TREDWWW}/tred/" - ln -sfr "tred-2-${SVN_VERSION}-${DISTRO}.noarch.rpm" "tred-${DISTRO}.rpm" + ln -sfr "tred-3-${GIT_DATE}-${DISTRO}.noarch.rpm" "tred-${DISTRO}.rpm" cd $d done @@ -46,7 +46,7 @@ echo "Creating symlinks for rpm packages ..." DISTROS=`ls -1 ./tred*.rpm | sed -E 's/^.*tred-[0-9]+-[0-9]+-//' | sed 's/[.]noarch[.]rpm$//' | tr "\\n" " "` for DISTRO in $DISTROS; do echo "... for $DISTRO ..." - ssh ${LOGIN_NAME}@${TESTING_SERVER} "cd /var/www/tred/testbed && ln -sf ./tred-2-${SVN_VERSION}-${DISTRO}.noarch.rpm ./tred-${DISTRO}.rpm" + ssh ${LOGIN_NAME}@${TESTING_SERVER} "cd /var/www/tred/testbed && ln -sf ./tred-3-${GIT_DATE}-${DISTRO}.noarch.rpm ./tred-${DISTRO}.rpm" done cd "$EXTDIR" diff --git a/admin/update-dist-dir.sh b/admin/update-dist-dir.sh index 62b931961..2c8328a94 100755 --- a/admin/update-dist-dir.sh +++ b/admin/update-dist-dir.sh @@ -12,14 +12,18 @@ if [ -e ${TRED_DIST_DIR}.new ]; then exit 1; fi && \ -echo "Exporting svn" && \ -svn export ${TRED_SVN_REPO} ${TRED_DIST_DIR}.new >> $LOG && \ -# updates TrEd version in dist/tred.new/tredlib/TrEd/Version.pm according to svn version to 1.#svn_version# -${TRED_DIST_DIR}.new/devel/update_version.pl ${TRED_SVN_REPO} && \ - -echo "Updating extensions" && \ +echo "Exporting git" && \ +##svn export ${TRED_SVN_REPO} ${TRED_DIST_DIR}.new >> $LOG && \ +git -C ${TRED_SRC_DIR} archive --output ${TRED_DIST_DIR}.new.zip HEAD >> $LOG && \ +unzip ${TRED_DIST_DIR}.new.zip -d ${TRED_DIST_DIR}.new >> $LOG && \ +rm ${TRED_DIST_DIR}.new.zip && \ +# updates TrEd version in dist/tred.new/tredlib/TrEd/Version.pm according to svn version to 3.#git_date# +${TRED_DIST_DIR}.new/devel/update_version.pl && \ + +echo "WARN: Skipping updating extensions" && \ +#echo "Updating extensions" && \ # perform pre-updates, update svn, then some post-updates for extension (currently only for tmt) according to extension/.make.d directory -${TRED_EXT_DIR}/update && \ +#${TRED_EXT_DIR}/update && \ cp ${TRED_SRC_DIR}/ChangeLog ${TRED_DIST_DIR}.new/ && \ diff --git a/admin/update-unix-dep-packages.sh b/admin/update-unix-dep-packages.sh index ec7704974..6bfe016b8 100755 --- a/admin/update-unix-dep-packages.sh +++ b/admin/update-unix-dep-packages.sh @@ -9,15 +9,9 @@ echo "Updating unix dependency packages" && \ echo "Remove old packages" && \ rm -rf ${TRED_UNIXINST_DIR}/packages_unix/packages && \ -# update svn -echo "Subversion update" && \ -svn up $TRED_UNIXINST_DIR >> $LOG && \ -echo "Subversion status" && \ -svn status $TRED_UNIXINST_DIR && \ - # fetch packages from CPAN && use INSTALL_BASE cd ${TRED_UNIXINST_DIR}/packages_unix && \ -echo "Remove old packages" && \ +echo "Update packages from CPAN" && \ PERLLIB= PERL5LIB= LD_LIBRARY_PATH= ./install -b -C && \ echo "Updating unix dependency packages done." diff --git a/dpan/dpan/authors/id/D/DP/DPAN/.gitkeep b/dpan/dpan/authors/id/D/DP/DPAN/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/dpan/patches/graph-kruskal.sh b/dpan/patches/graph-kruskal.sh index 76baafc8b..cc27a5958 100755 --- a/dpan/patches/graph-kruskal.sh +++ b/dpan/patches/graph-kruskal.sh @@ -6,7 +6,7 @@ # should do the trick EXTDIR=`dirname $(readlink -fen $0)` -SVN_DIR=$(dirname $(dirname $(dirname $(dirname $(readlink -fen $0))))) +GIT_DIR=$(dirname $(dirname $(dirname $(readlink -fen $0)))) . "$EXTDIR/../../admin/env.sh" echo "Patching Graph::Kruskal" && \ diff --git a/dpan/patches/syntax-highlight-perl.sh b/dpan/patches/syntax-highlight-perl.sh index 6cc647c6b..e9803f220 100755 --- a/dpan/patches/syntax-highlight-perl.sh +++ b/dpan/patches/syntax-highlight-perl.sh @@ -6,7 +6,7 @@ # forbidden on Windows, so we need to rename the file EXTDIR=`dirname $(readlink -fen $0)` -SVN_DIR=$(dirname $(dirname $(dirname $(dirname $(readlink -fen $0))))) +GIT_DIR=$(dirname $(dirname $(dirname $(readlink -fen $0)))) . "$EXTDIR/../../admin/env.sh" echo "Patching Syntax::Highlight::Perl" && \ diff --git a/dpan/patches/tk.sh b/dpan/patches/tk.sh index fadb06ea2..8a719f7a3 100755 --- a/dpan/patches/tk.sh +++ b/dpan/patches/tk.sh @@ -9,7 +9,7 @@ EXTDIR=`dirname $(readlink -fen $0)` -SVN_DIR=$(dirname $(dirname $(dirname $(dirname $(readlink -fen $0))))) +GIT_DIR=$(dirname $(dirname $(dirname $(readlink -fen $0)))) . "$EXTDIR/../../admin/env.sh" echo "Patching Tk" && \ diff --git a/tred_refactored/devel/unix_install/install_tred.bash b/tred_refactored/devel/unix_install/install_tred.bash index 4b12b294c..a621c194f 100755 --- a/tred_refactored/devel/unix_install/install_tred.bash +++ b/tred_refactored/devel/unix_install/install_tred.bash @@ -184,8 +184,13 @@ if [ "$PRINT_VERSION" = 1 ]; then echo Version: $VERSION; exit; fi if [ "$PRINT_HELP" = 1 ]; then help; exit; fi if [ "$PRINT_USAGE" = 1 ]; then usage; exit; fi if [ x`uname -s` == xDarwin ]; then - echo Adding //Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE to CPATH - export CPATH=$CPATH://Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE + darwinCPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Perl/5.*/darwin-*/CORE + if [ -d $darwinCPATH ];then + echo Adding $darwinCPATH to CPATH + export CPATH=$CPATH:$darwinCPATH + else + echo "WARNING: header path ($darwinCPATH) does not exist" + fi fi fetch_url () { diff --git a/tred_refactored/devel/unix_install/packages_unix/install b/tred_refactored/devel/unix_install/packages_unix/install index 847c41b68..57df8597f 100755 --- a/tred_refactored/devel/unix_install/packages_unix/install +++ b/tred_refactored/devel/unix_install/packages_unix/install @@ -714,8 +714,8 @@ sub do_install_perl_module { } my $buildpl_flags= '--'.lc($BASE_DIR_FLAG).' '.shell_quote($PERL_PREFIX).' '.$MODULE_BUILD_FLAGS{$module}; my $makepl_flags= $BASE_DIR_FLAG.'='.shell_quote($PERL_PREFIX).' '.$MODULE_BUILD_FLAGS{$module}; - my $build_test = ($DO_MAKE_TEST && $IGNORE_TEST_FAILS{$module}!=2) ? (($FORCE || $IGNORE_TEST_FAILS{$module}) ? "(./Build test || true) && " : "./Build test && ") : ""; - my $make_test = ($DO_MAKE_TEST && $IGNORE_TEST_FAILS{$module}!=2) ? (($FORCE || $IGNORE_TEST_FAILS{$module}) ? "($Config{make} test || true) && " : "make test && ") : ""; + my $build_test = ($DO_MAKE_TEST && $IGNORE_TEST_FAILS{$module}!=2) ? (($FORCE || $IGNORE_TEST_FAILS{$module}) ? "(./Build test || true) && " : "./Build test && ") : "echo 'INFO: skipping tests' &&"; + my $make_test = ($DO_MAKE_TEST && $IGNORE_TEST_FAILS{$module}!=2) ? (($FORCE || $IGNORE_TEST_FAILS{$module}) ? "($Config{make} test || true) && " : "make test && ") : "echo 'INFO: skipping tests' &&"; my $input = $MODULE_BUILD_INPUT{$module}; $input = ((defined($input) and length($input)) @@ -729,11 +729,13 @@ sub do_install_perl_module { cd '$dir' && \\ $run_patches \\ ${input}(if [ -f Build.PL ]; then \\ + echo "INFO: using Build.PL for building and installing" && \\ $^X Build.PL $buildpl_flags && \\ ./Build && $build_test ./Build install else + echo "INFO: using Makefile.PL for building and installing" echo LD_LIBRARY_PATH is "\$LD_LIBRARY_PATH" echo PERL5LIB is "\$PERL5LIB" $^X Makefile.PL $makepl_flags && \\ diff --git a/tred_refactored/devel/unix_install/packages_unix/install.cfg b/tred_refactored/devel/unix_install/packages_unix/install.cfg index 1311e458f..b40d068e6 100644 --- a/tred_refactored/devel/unix_install/packages_unix/install.cfg +++ b/tred_refactored/devel/unix_install/packages_unix/install.cfg @@ -33,13 +33,13 @@ sub perl_modules { # Probe-Perl- # Test-Script- qw( + Term-Table- Test-Simple- Capture-Tiny- Perl-OSType- ExtUtils-MakeMaker- ExtUtils-CBuilder- ExtUtils-ParseXS- - Test-Simple- version- Module-Metadata- Version-Requirements- @@ -57,6 +57,37 @@ sub perl_modules { Tie-IxHash- Tk- Syntax-Highlight-Perl- + Getopt-Long- + Math-Round- + AppConfig- + Test-LeakTrace- + Template-Toolkit- + HTML-Entities- + HTML-HeadParser- + HTTP-Date- + B-COW- + Clone- + MIME-Base32- + Try-Tiny- + Test-Needs- + Test-Warnings- + URI- + Test-Deep- + Test-Requires- + HTTP-CookieJar- + Encode-Locale- + IO-HTML- + Test-Fatal- + LWP-MediaTypes- + HTTP-Message- + HTTP-Cookies- + Try-Tiny- + URI-Escape- + libwww-perl- + XML-Parser- + XML-TokeParser- + Syntax-Kamelon- + Test-Tk- Tk-CodeText- Compress-Raw-Zlib- Compress-Raw-Bzip2- @@ -64,6 +95,15 @@ sub perl_modules { XML-NamespaceSupport- XML-SAX-Base- XML-SAX- + FFI-CheckLib- + File-chdir- + Path-Tiny- + PkgConfig- + HTML-Tagset- + HTML-Parser- + Alien-Build- + Alien-Build-Plugin-Download-GitLab- + Alien-Libxml2- XML-LibXML- XML-LibXSLT- XML-CompactTree- @@ -75,11 +115,12 @@ sub perl_modules { XML-Writer- Text-Balanced- Parse-RecDescent- + Heap- + Set-Object- Graph- Graph-ChuLiuEdmonds- Graph-Kruskal- PerlIO-gzip- - Test-Warnings- Sub-Identify- SUPER- Test-MockModule- @@ -90,14 +131,6 @@ sub perl_modules { File-ShareDir-Install- File-ShareDir- File-pushd- - URI- - Try-Tiny- - HTTP-Date- - Encode-Locale- - IO-HTML- - LWP-MediaTypes- - HTTP-Message- - libwww-perl- Treex-PML- IO-Zlib- ExtUtils-Helpers- @@ -143,7 +176,8 @@ sub version_from { ( 'IO-Compress-' => 'IO::Compress::Base', 'PDF-API2-' => 'AREIBENS/PDF-API2-0.73.tar.gz', - 'libwww-perl-' => 'ETHER/libwww-perl-6.35.tar.gz', + 'libwww-perl-' => 'OALDERS/libwww-perl-6.77.tar.gz', + 'Tk-CodeText-' => 'HANJE/Tk-CodeText-0.3.4.tar.gz', # new versions are not working on MacOS due to Imager-Screenshot dependency (scdarwin2.c:61:22: error: 'CGDisplayCreateImageForRect' is unavailable: obsoleted in macOS 15.0) ) } @@ -203,7 +237,10 @@ sub patches { # fixed in Tk 804.030 # https://bugs.gentoo.org/show_bug.cgi?id=345987 #'Tk-' => 'patches/Tk-xlib-h.patch', - 'Tk-' => 'patches/Tk-myConfig.patch', + 'Tk-' => [ + 'patches/Tk-myConfig.patch', + 'patches/Tk-JPEG-Makefile.jpeg.maybe.patch', + ], # Don't fail when can't modify global site Perl SAX configuration #'XML-LibXML-' => 'patches/XML-LibXML-Makefile.patch', # ... no longer required diff --git a/tred_refactored/devel/unix_install/packages_unix/patches/Tk-JPEG-Makefile.jpeg.maybe.patch b/tred_refactored/devel/unix_install/packages_unix/patches/Tk-JPEG-Makefile.jpeg.maybe.patch new file mode 100644 index 000000000..7a76001a5 --- /dev/null +++ b/tred_refactored/devel/unix_install/packages_unix/patches/Tk-JPEG-Makefile.jpeg.maybe.patch @@ -0,0 +1,15 @@ +--- JPEG/Makefile.jpeg.maybe.orig 2020-03-19 21:41:00.000000000 +0100 ++++ JPEG/Makefile.jpeg.maybe 2024-06-14 14:35:38.313024340 +0200 +@@ -31,9 +31,10 @@ + } + else + { ++ my $ccstdflags = ($^O eq 'darwin') ? '-std=c89' : ''; + $ENV{CC} = $Config{cc}; +- local $ENV{CFLAGS} = "$Config{ccflags} $Config{cccdlflags}"; +- local $ENV{LDFLAGS} = "$Config{ccflags} $Config{ldflags}"; ++ local $ENV{CFLAGS} = "$ccstdflags $Config{ccflags} $Config{cccdlflags}"; ++ local $ENV{LDFLAGS} = "$ccstdflags $Config{ccflags} $Config{ldflags}"; + system(sh => "./configure"); + } + diff --git a/tred_refactored/devel/update_version.pl b/tred_refactored/devel/update_version.pl index 978d12a3c..51ec16a78 100755 --- a/tred_refactored/devel/update_version.pl +++ b/tred_refactored/devel/update_version.pl @@ -34,14 +34,10 @@ my $version_file = File::Spec->rel2abs('../tredlib/TrEd/Version.pm',$rb); die "Did not find $version_file!" if !-f $version_file; -# You'd better pass an arg to set this or this may fail in the future -my $REPO = shift || 'https://svn.ms.mff.cuni.cz/svn/TrEd_refactored/tred_refactored/'; -my $svn_version = `svn info "$REPO" |grep "^Revision:" |cut -f2 -d:`; -my $updated_version = sprintf("%04d", $svn_version); -my $VER = '2.' . $updated_version; -chomp $VER; -$VER=~s/\s+//g; +my $git_date = `git log -1 --date=format:"%Y%m%d" --format="%ad"`; +chomp $git_date; +my $VER = '3.' . $git_date; print $VER,"\n" unless $opts{'quiet'}; print STDERR "TrEd::Version: $version_file\n" if $opts{debug}; @@ -70,7 +66,7 @@ =head1 NAME =head1 SYNOPSIS -update_version.pl [--debug|-D] [--quiet|-q] [--no-update|-n] [REPOSITORY_URL] +update_version.pl [--debug|-D] [--quiet|-q] [--no-update|-n] or update_version.pl -u for usage update_version.pl -h for help @@ -79,7 +75,7 @@ =head1 SYNOPSIS =head1 DESCRIPTION This script updates the version number in the module TrEd::Version based on -the current SVN revision number of TrEd. +the current GIT revision date of TrEd. =over 5 diff --git a/tred_refactored/documentation/index.html b/tred_refactored/documentation/index.html index acd921a67..939bd86ba 100644 --- a/tred_refactored/documentation/index.html +++ b/tred_refactored/documentation/index.html @@ -10,7 +10,7 @@ type="application/rss+xml" /> -

Tree Editor TrEd 2.0

+

Tree Editor TrEd 3.0