Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SVN to GIT #5

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open

SVN to GIT #5

wants to merge 54 commits into from

Conversation

matyaskopp
Copy link
Member

No description provided.

…og, load external extensions repository, use fifferent version numbering #3
@matyaskopp matyaskopp linked an issue May 27, 2024 that may be closed by this pull request
@@ -1,19 +1,19 @@
#!/bin/bash

# Root dir of the SVN checkout. All dirs are derived from this one
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the comments, too. s/SVN/git/

Comment on lines +22 to +25
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 && \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does skipping the update mean?

@@ -36,6 +36,7 @@
die "Did not find $version_file!" if !-f $version_file;

my $git_date = `git log -1 --date=format:"\%Y\%m\%d" --format="%ad"`;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backslashes not needed.

@@ -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" && \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the long run, we should switch to CPAN::Distroprefs (those who can see UFAL internal svn, see MED#446).

matyaskopp and others added 29 commits September 30, 2024 18:15
@@ -185,6 +177,7 @@ sub version_from {
'IO-Compress-' => 'IO::Compress::Base',
'PDF-API2-' => 'AREIBENS/PDF-API2-0.73.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)
Copy link
Collaborator

@choroba choroba Nov 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be great to set your Mac as a CPAN Tester. There are no failures for darwin at the Testers page. I can help you with that, but it should be easily googlable.

Also, TrEd works happily even without Tk::CodeText at all. I don't have it installed and I see no problems with that - I don't get syntax highlighting when writing code in the Alt+E window, but I don't really care. Which means - what about making it optional?

Copy link
Collaborator

@choroba choroba Nov 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't the downgrade be conditional

Suggested change
'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)
'Tk-CodeText-' => ('darwin' eq $^O) ? 'HANJE/Tk-CodeText-0.3.4.tar.gz' : 'Tk::CodeText',

?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

svn2git: change build setup for git
2 participants