Merged #3599 into master.
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3599#event-10684019579
You are receiving this because you are subscribed to this thread.
Message ID:
OK to merge so I can test the full macOS build + bundling tomorrow?
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3599#issuecomment-1767171751
You are receiving this because you are subscribed to this thread.
Message ID:
@b4n approved this pull request.
WFM
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3599#pullrequestreview-1682534844
You are receiving this because you are subscribed to this thread.
Message ID:
@b4n commented on this pull request.
> @@ -23,6 +23,7 @@ s/^\(#define VER_FILEVERSION_STR *\)[^ ].*$/\1"'"$VER"'"/
' -i geany_private.rc
sed -e 's/^\(AC_INIT([^,]*, *\[\)[^]]*\(\],\)/\1'"$VER"'\2/' -i configure.ac
+sed -e 's/^\( *version: *\)[^,]*\(,\)/\1'"\'$VER\'"'\2/' -i meson.build
Could at least the part setting the version in meson.build to "2.0" be merged?
geany-plugins now depend on 2.0 and this prevents a successful build when meson
is used for Geany.
(I'd like to test if everything is alright for the macOS build before the
release.)
--
Reply to this email
@eht16 commented on this pull request.
> @@ -23,6 +23,7 @@ s/^\(#define VER_FILEVERSION_STR *\)[^ ].*$/\1"'"$VER"'"/
' -i geany_private.rc
sed -e 's/^\(AC_INIT([^,]*, *\[\)[^]]*\(\],\)/\1'"$VER"'\2/' -i configure.ac
+sed -e 's/^\( *version: *\)[^,]*\(,\)/\1'"\'$VER\'"'\2/' -i meson.build
@eht16 pushed 1 commit.
ec30b893a7f4a1ef747bbca3ab047bbbca678ff2 Update scripts/version-bump
--
View it on GitHub:
https://github.com/geany/geany/pull/3599/files/9eeaa691a1d1a68069030226b9d8b0d84cbb9ba7..ec30b893a7f4a1ef747bbca3ab047bbbca678ff2
You are receiving this because you are subscribed
@b4n commented on this pull request.
> @@ -23,6 +23,7 @@ s/^\(#define VER_FILEVERSION_STR *\)[^ ].*$/\1"'"$VER"'"/
' -i geany_private.rc
sed -e 's/^\(AC_INIT([^,]*, *\[\)[^]]*\(\],\)/\1'"$VER"'\2/' -i configure.ac
+sed -e 's/^\( *version: *\)[^,]*\(,\)/\1'"\'$VER\'"'\2/' -i meson.build
@dolik-rce commented on this pull request.
> @@ -23,6 +23,7 @@ s/^\(#define VER_FILEVERSION_STR *\)[^ ].*$/\1"'"$VER"'"/
' -i geany_private.rc
sed -e 's/^\(AC_INIT([^,]*, *\[\)[^]]*\(\],\)/\1'"$VER"'\2/' -i configure.ac
+sed -e 's/^\( *version: *\)[^,]*\(,\)/\1'"\'$VER\'"'\2/' -i
> What about simply adding a `q` command after the first replacement so only
> that one is handled?
I don't know how to do, my sed skills are still on a beginner level and I guess
this will remain so :).
Tried: `sed -e 's/^\( *version: *\)[^,]*\(,\)/\1'"\'$VER\'"'\2/;q' -i
meson.build`
but
What about simply adding a `q` command after the first replacement so only that
one is handled?
Le 15 octobre 2023 10:05:04 GMT+02:00, "Enrico Tröger" ***@***.***> a écrit :
>@eht16 commented on this pull request.
>
>
>
>> @@ -23,6 +23,7 @@ s/^\(#define VER_FILEVERSION_STR *\)[^
@eht16 commented on this pull request.
> @@ -23,6 +23,7 @@ s/^\(#define VER_FILEVERSION_STR *\)[^ ].*$/\1"'"$VER"'"/
' -i geany_private.rc
sed -e 's/^\(AC_INIT([^,]*, *\[\)[^]]*\(\],\)/\1'"$VER"'\2/' -i configure.ac
+sed -e 's/^\( *version: *\)[^,]*\(,\)/\1'"\'$VER\'"'\2/' -i meson.build
@kugel- commented on this pull request.
> @@ -23,6 +23,7 @@ s/^\(#define VER_FILEVERSION_STR *\)[^ ].*$/\1"'"$VER"'"/
' -i geany_private.rc
sed -e 's/^\(AC_INIT([^,]*, *\[\)[^]]*\(\],\)/\1'"$VER"'\2/' -i configure.ac
+sed -e 's/^\( *version: *\)[^,]*\(,\)/\1'"\'$VER\'"'\2/' -i meson.build
@kugel- approved this pull request.
--
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/3599#pullrequestreview-1678401360
You are receiving this because you are subscribed to this thread.
Message ID:
14 matches
Mail list logo
