marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add SVN source type 

Closes: #135
Approved by: alexlarsson
auto
Alexander Larsson 2018-04-25 12:52:13 +02:00 committed by Atomic Bot
parent c9df9b89fc
commit 4510aa2359
6 changed files with 494 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/flatpak-builder.xml
View File

@ -199,7 +199,7 @@
<listitem><para>
Download missing sources, but don't update local mirrors of version control repos. This is useful
to rebuild things but without updating git or bzr repositories from the remote repository.
to rebuild things but without updating git, bzr or svn repositories from the remote repository.
</para></listitem>
</varlistentry>
@ -499,7 +499,7 @@
<term><option>--extra-sources=SOURCE-DIR</option></term>
<listitem><para>
When downloading sources (archives, files, git, bzr), look in this
When downloading sources (archives, files, git, bzr, svn), look in this
directory for pre-existing copies and use them instead of downloading.
</para></listitem>
</varlistentry>
@ -508,7 +508,7 @@
<term><option>--extra-sources-url=URL</option></term>
<listitem><para>
When downloading sources (archives, files, git, bzr), look at this url
When downloading sources (archives, files, git, bzr, svn), look at this url
for mirrored downloads before downloading from the original url.
</para></listitem>
</varlistentry>

17
doc/flatpak-manifest.xml
View File

@ -666,6 +666,23 @@
</varlistentry>
</variablelist>
</refsect3>
<refsect3>
<title>Svn sources</title>
<variablelist>
<varlistentry>
<term><option>type</option></term>
<listitem><para>"svn"</para></listitem>
</varlistentry>
<varlistentry>
<term><option>url</option> (string)</term>
<listitem><para>URL of the svn repository, including branch/tag part</para></listitem>
</varlistentry>
<varlistentry>
<term><option>revision</option> (string)</term>
<listitem><para>A specific revision number to use</para></listitem>
</varlistentry>
</variablelist>
</refsect3>
<refsect3>
<title>File sources</title>
<variablelist>

2
src/Makefile.am.inc
View File

@ -22,6 +22,8 @@ flatpak_builder_SOURCES = \
src/builder-source-git.h \
src/builder-source-bzr.c \
src/builder-source-bzr.h \
src/builder-source-svn.c \
src/builder-source-svn.h \
src/builder-source-file.c \
src/builder-source-file.h \
src/builder-source-script.c \

427
src/builder-source-svn.c 100644
View File

@ -0,0 +1,427 @@
/* builder-source-svn.c
*
* Copyright (C) 2015 Red Hat, Inc
*
* This file is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This file is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Alexander Larsson <alexl@redhat.com>
*/
#include "config.h"
#include <string.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/statfs.h>
#include "builder-utils.h"
#include "builder-source-svn.h"
#include "builder-utils.h"
#include "builder-flatpak-utils.h"
struct BuilderSourceSvn
{
BuilderSource parent;
char *url;
char *revision;
char *orig_revision;
};
typedef struct
{
BuilderSourceClass parent_class;
} BuilderSourceSvnClass;
G_DEFINE_TYPE (BuilderSourceSvn, builder_source_svn, BUILDER_TYPE_SOURCE);
enum {
PROP_0,
PROP_URL,
PROP_REVISION,
LAST_PROP
};
static gboolean
svn (GFile *dir,
char **output,
GError **error,
...)
{
gboolean res;
va_list ap;
va_start (ap, error);
res = flatpak_spawn (dir, output, 0, error, "svn", ap);
va_end (ap);
return res;
}
static gboolean
cp (GError **error,
...)
{
gboolean res;
va_list ap;
va_start (ap, error);
res = flatpak_spawn (NULL, NULL, 0, error, "cp", ap);
va_end (ap);
return res;
}
static gboolean
cp_dir (GFile *src_dir, GFile *dst_dir, GError **error)
{
g_autofree char *src_path = g_strconcat (flatpak_file_get_path_cached (src_dir), "/", NULL);
g_autofree char *dst_path = g_strconcat (flatpak_file_get_path_cached (dst_dir), "/", NULL);
if (!cp (error, "-aT", src_path, dst_path, NULL))
return FALSE;
return TRUE;
}
static void
builder_source_svn_finalize (GObject *object)
{
BuilderSourceSvn *self = (BuilderSourceSvn *) object;
g_free (self->url);
g_free (self->revision);
g_free (self->orig_revision);
G_OBJECT_CLASS (builder_source_svn_parent_class)->finalize (object);
}
static void
builder_source_svn_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
BuilderSourceSvn *self = BUILDER_SOURCE_SVN (object);
switch (prop_id)
{
case PROP_URL:
g_value_set_string (value, self->url);
break;
case PROP_REVISION:
g_value_set_string (value, self->revision);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
builder_source_svn_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
BuilderSourceSvn *self = BUILDER_SOURCE_SVN (object);
switch (prop_id)
{
case PROP_URL:
g_free (self->url);
self->url = g_value_dup_string (value);
break;
case PROP_REVISION:
g_free (self->revision);
self->revision = g_value_dup_string (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static GFile *
get_mirror_dir (BuilderSourceSvn *self, BuilderContext *context, const char *revision)
{
g_autoptr(GFile) svn_dir = NULL;
g_autofree char *uri_filename = NULL;
g_autofree char *filename = NULL;
g_autofree char *svn_dir_path = NULL;
svn_dir = g_file_get_child (builder_context_get_state_dir (context),
"svn");
svn_dir_path = g_file_get_path (svn_dir);
g_mkdir_with_parents (svn_dir_path, 0755);
uri_filename = builder_uri_to_filename (self->url);
if (revision)
filename = g_strconcat (uri_filename, "__r", revision, NULL);
else
filename = g_strdup (uri_filename);
return g_file_get_child (svn_dir, filename);
}
static char *
get_current_revision (BuilderSourceSvn *self, BuilderContext *context, GError **error)
{
g_autoptr(GFile) mirror_dir = NULL;
char *output = NULL;
mirror_dir = get_mirror_dir (self, context, self->revision);
if (!svn (mirror_dir, &output, error,
"info", "--non-interactive", "--show-item", "revision", NULL))
return NULL;
/* Trim trailing whitespace */
g_strchomp (output);
return output;
}
static gboolean
builder_source_svn_download (BuilderSource *source,
gboolean update_vcs,
BuilderContext *context,
GError **error)
{
BuilderSourceSvn *self = BUILDER_SOURCE_SVN (source);
g_autoptr(GFile) parent = NULL;
g_autofree char *filename = NULL;
g_autoptr(GFile) mirror_dir = NULL;
if (self->url == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "URL not specified");
return FALSE;
}
mirror_dir = get_mirror_dir (self, context, self->revision);
parent = g_file_get_parent (mirror_dir);
filename = g_file_get_basename (mirror_dir);
if (!g_file_query_exists (mirror_dir, NULL))
{
g_autofree char *mirror_path = g_file_get_path (mirror_dir);
g_autofree char *path_tmp = g_strconcat (mirror_path, ".clone_XXXXXX", NULL);
g_autofree char *filename_tmp = NULL;
g_autoptr(GFile) mirror_dir_tmp = NULL;
g_autoptr(GFile) cached_svn_dir = NULL;
if (g_mkdtemp_full (path_tmp, 0755) == NULL)
return flatpak_fail (error, "Can't create temporary directory");
mirror_dir_tmp = g_file_new_for_path (path_tmp);
filename_tmp = g_file_get_basename (mirror_dir_tmp);
cached_svn_dir = builder_context_find_in_sources_dirs (context, "svn", filename, NULL);
if (cached_svn_dir != NULL)
{
if (!cp_dir (cached_svn_dir, mirror_dir_tmp, error))
return FALSE;
if (update_vcs)
{
g_print ("Updating svn repo %s\n", self->url);
if (!svn (parent, NULL, error,
"update", "--non-interactive",
"-r", self->revision ? self->revision : "HEAD",
filename_tmp, NULL))
return FALSE;
}
}
else
{
g_print ("Getting svn repo %s\n", self->url);
if (!svn (parent, NULL, error,
"checkout", "--non-interactive",
"-r", self->revision ? self->revision : "HEAD",
self->url, filename_tmp, NULL))
return FALSE;
}
if (!g_file_move (mirror_dir_tmp, mirror_dir, 0, NULL, NULL, NULL, error))
return FALSE;
}
else if (update_vcs)
{
g_print ("Updating svn repo %s\n", self->url);
if (!svn (parent, NULL, error,
"update", "--non-interactive",
"-r", self->revision ? self->revision : "HEAD",
filename, NULL))
return FALSE;
}
return TRUE;
}
static gboolean
builder_source_svn_extract (BuilderSource *source,
GFile *dest,
BuilderOptions *build_options,
BuilderContext *context,
GError **error)
{
BuilderSourceSvn *self = BUILDER_SOURCE_SVN (source);
g_autoptr(GFile) mirror_dir = NULL;
g_autofree char *dest_path = NULL;
mirror_dir = get_mirror_dir (self, context, self->revision);
dest_path = g_file_get_path (dest);
g_mkdir_with_parents (dest_path, 0755);
if (!cp_dir (mirror_dir, dest, error))
return FALSE;
return TRUE;
}
static gboolean
builder_source_svn_bundle (BuilderSource *source,
BuilderContext *context,
GError **error)
{
BuilderSourceSvn *self = BUILDER_SOURCE_SVN (source);
g_autoptr(GFile) mirror_dir = NULL;
g_autoptr(GFile) dest_dir = NULL;
g_autofree char *base_name = NULL;
mirror_dir = get_mirror_dir (self, context, self->orig_revision);
if (mirror_dir == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Can't locate repo with URL '%s'", self->url);
return FALSE;
}
base_name = g_file_get_basename (mirror_dir);
dest_dir = flatpak_build_file (builder_context_get_app_dir (context),
"sources/svn", base_name,
NULL);
if (!flatpak_mkdir_p (dest_dir, NULL, error))
return FALSE;
if (!cp_dir (mirror_dir, dest_dir, error))
return FALSE;
if (self->orig_revision == NULL)
{
g_autoptr(GFile) alt_mirror_dir = get_mirror_dir (self, context, self->revision);
g_autofree char *alt_base_name = g_file_get_basename (alt_mirror_dir);
g_autoptr(GFile) alt_dest_dir = flatpak_build_file (builder_context_get_app_dir (context),
"sources/svn", alt_base_name,
NULL);
g_print ("alt_mirror_dir: %s (basename %s)\n", g_file_get_path (alt_mirror_dir), base_name);
if (!g_file_query_exists (alt_dest_dir, NULL) &&
!g_file_make_symbolic_link (alt_dest_dir, base_name, NULL, error))
return FALSE;
}
return TRUE;
}
static void
builder_source_svn_checksum (BuilderSource *source,
BuilderCache *cache,
BuilderContext *context)
{
BuilderSourceSvn *self = BUILDER_SOURCE_SVN (source);
g_autofree char *current_revision = NULL;
g_autoptr(GError) error = NULL;
builder_cache_checksum_str (cache, self->url);
builder_cache_checksum_str (cache, self->revision);
current_revision = get_current_revision (self, context, &error);
if (current_revision)
builder_cache_checksum_str (cache, current_revision);
else if (error)
g_warning ("Failed to get current svn revision: %s", error->message);
}
static gboolean
builder_source_svn_update (BuilderSource *source,
BuilderContext *context,
GError **error)
{
BuilderSourceSvn *self = BUILDER_SOURCE_SVN (source);
char *current_revision;
self->orig_revision = g_strdup (self->revision);
current_revision = get_current_revision (self, context, NULL);
if (current_revision)
{
g_free (self->revision);
self->revision = current_revision;
}
return TRUE;
}
static void
builder_source_svn_class_init (BuilderSourceSvnClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
BuilderSourceClass *source_class = BUILDER_SOURCE_CLASS (klass);
object_class->finalize = builder_source_svn_finalize;
object_class->get_property = builder_source_svn_get_property;
object_class->set_property = builder_source_svn_set_property;
source_class->download = builder_source_svn_download;
source_class->extract = builder_source_svn_extract;
source_class->bundle = builder_source_svn_bundle;
source_class->update = builder_source_svn_update;
source_class->checksum = builder_source_svn_checksum;
g_object_class_install_property (object_class,
PROP_URL,
g_param_spec_string ("url",
"",
"",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_REVISION,
g_param_spec_string ("revision",
"",
"",
NULL,
G_PARAM_READWRITE));
}
static void
builder_source_svn_init (BuilderSourceSvn *self)
{
}

40
src/builder-source-svn.h 100644
View File

@ -0,0 +1,40 @@
/*
* Copyright © 2015 Red Hat, Inc
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Authors:
* Alexander Larsson <alexl@redhat.com>
*/
#ifndef __BUILDER_SOURCE_SVN_H__
#define __BUILDER_SOURCE_SVN_H__
#include "builder-source.h"
G_BEGIN_DECLS
typedef struct BuilderSourceSvn BuilderSourceSvn;
#define BUILDER_TYPE_SOURCE_SVN (builder_source_svn_get_type ())
#define BUILDER_SOURCE_SVN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), BUILDER_TYPE_SOURCE_SVN, BuilderSourceSvn))
#define BUILDER_IS_SOURCE_SVN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BUILDER_TYPE_SOURCE_SVN))
GType builder_source_svn_get_type (void);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (BuilderSourceSvn, g_object_unref)
G_END_DECLS
#endif /* __BUILDER_SOURCE_SVN_H__ */

5
src/builder-source.c
View File

@ -33,6 +33,7 @@
#include "builder-source-patch.h"
#include "builder-source-git.h"
#include "builder-source-bzr.h"
#include "builder-source-svn.h"
#include "builder-source-file.h"
#include "builder-source-script.h"
#include "builder-source-shell.h"
@ -261,6 +262,8 @@ builder_source_to_json (BuilderSource *self)
type = "git";
else if (BUILDER_IS_SOURCE_BZR (self))
type = "bzr";
else if (BUILDER_IS_SOURCE_SVN (self))
type = "svn";
else
g_warning ("Unknown source type");
@ -296,6 +299,8 @@ builder_source_from_json (JsonNode *node)
return (BuilderSource *) json_gobject_deserialize (BUILDER_TYPE_SOURCE_GIT, node);
else if (strcmp (type, "bzr") == 0)
return (BuilderSource *) json_gobject_deserialize (BUILDER_TYPE_SOURCE_BZR, node);
else if (strcmp (type, "svn") == 0)
return (BuilderSource *) json_gobject_deserialize (BUILDER_TYPE_SOURCE_SVN, node);
else
g_warning ("Unknown source type %s", type);