Commits (3)
......@@ -16,7 +16,7 @@ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
mv $(glib_gen_basename)-marshal.h.tmp $(glib_gen_basename)-marshal.h
$(glib_gen_basename)-marshal.c: $(glib_gen_basename)-marshal.list
$(AM_V_GEN)echo "#include \"$(glib_gen_basename)-marshal.h\"" >> $(glib_gen_basename)-marshal.c.tmp && \
$(AM_V_GEN)echo "#include \"config.h\"\n#include \"$(glib_gen_basename)-marshal.h\"" >> $(glib_gen_basename)-marshal.c.tmp && \
$(GLIB_GENMARSHAL) --body --prefix=$(glib_gen_prefix)_marshal $^ >> $(glib_gen_basename)-marshal.c.tmp && \
mv $(glib_gen_basename)-marshal.c.tmp $(glib_gen_basename)-marshal.c
......@@ -31,7 +31,7 @@ $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
$(glib_gen_basename)-enumtypes.c: $(glib_enum_headers)
@if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
$(AM_V_GEN)$(GLIB_MKENUMS) \
--fhead "#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \
--fhead "#ifdef HAVE_CONFIG_H\n#include \"config.h\"\n#endif\n\n#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
......
......@@ -21,7 +21,7 @@
# network usage.
BRANCH=master
reference=~/gst
PUSHURL=ssh://git.freedesktop.org/git/gstreamer
PUSHURL=git@gitlab.freedesktop.org:gstreamer
DRY_RUN=
KEEP=no
COMMON_COMMIT=
......@@ -78,17 +78,11 @@ for module in $modules
do
cd $dir
if test -e $reference/$module/.git ; then
pushd $reference/$module
PUSHURL=`git config remote.origin.url | sed 's@\(git/gstreamer\).*@\1@'`
popd
git clone --reference $reference/$module/.git --shared ssh://git.freedesktop.org/git/gstreamer/$module
git clone --reference $reference/$module/.git --shared git@gitlab.freedesktop.org:gstreamer/$module.git
elif test -e $topdir/$module/.git ; then
pushd $topdir/$module
PUSHURL=`git config remote.origin.url | sed 's@\(git/gstreamer\).*@\1@'`
popd
git clone --reference $topdir/$module/.git --shared $PUSHURL/$module
git clone --reference $topdir/$module/.git --shared $PUSHURL/$module.git
else
git clone $PUSHURL/$module
git clone $PUSHURL/$module.git
fi
cd $dir/$module
......