[refactor] change name app name to teleport
This commit is contained in:
6
.gitignore
vendored
6
.gitignore
vendored
@@ -24,9 +24,9 @@ _libs
|
|||||||
/main.o
|
/main.o
|
||||||
/resources.c
|
/resources.c
|
||||||
/resources.o
|
/resources.o
|
||||||
/teleportapp
|
/teleport
|
||||||
/teleportapp.o
|
/teleport.o
|
||||||
/teleportappwin.o
|
/teleportwin.o
|
||||||
test_download
|
test_download
|
||||||
Makefile
|
Makefile
|
||||||
_build/
|
_build/
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ We are currently working on an MVP for a native GNOME app that only sends files,
|
|||||||
cd teleport
|
cd teleport
|
||||||
./configure
|
./configure
|
||||||
make
|
make
|
||||||
./_build/src/teleportapp
|
./_build/src/teleport
|
||||||
```
|
```
|
||||||
#### Ubuntu
|
#### Ubuntu
|
||||||
```
|
```
|
||||||
@@ -37,7 +37,7 @@ We are currently working on an MVP for a native GNOME app that only sends files,
|
|||||||
cd teleport
|
cd teleport
|
||||||
./configure
|
./configure
|
||||||
make
|
make
|
||||||
./_build/src/teleportapp
|
./_build/src/teleport
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=Teleport
|
Name=Teleport
|
||||||
Exec=teleportapp
|
Exec=teleport
|
||||||
Icon=com.frac_tion.teleport
|
Icon=com.frac_tion.teleport
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=GTK;GNOME;Utility;
|
Categories=GTK;GNOME;Utility;
|
||||||
|
|||||||
@@ -11,6 +11,6 @@ icon_sizes = [
|
|||||||
foreach icon_size: icon_sizes
|
foreach icon_size: icon_sizes
|
||||||
install_subdir(
|
install_subdir(
|
||||||
'hicolor/' + icon_size,
|
'hicolor/' + icon_size,
|
||||||
install_dir: join_paths(teleportapp_datadir, 'icons', 'hicolor')
|
install_dir: join_paths(teleport_datadir, 'icons', 'hicolor')
|
||||||
)
|
)
|
||||||
endforeach
|
endforeach
|
||||||
|
|||||||
@@ -7,25 +7,25 @@ i18n.merge_file(
|
|||||||
output: desktop,
|
output: desktop,
|
||||||
po_dir: po_dir,
|
po_dir: po_dir,
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: join_paths(teleportapp_datadir, 'applications')
|
install_dir: join_paths(teleport_datadir, 'applications')
|
||||||
)
|
)
|
||||||
|
|
||||||
#gnome.mkenums(
|
#gnome.mkenums(
|
||||||
# 'org.gtk.teleportapp.enums.xml',
|
# 'org.gtk.teleport.enums.xml',
|
||||||
# sources: enum_headers,
|
# sources: enum_headers,
|
||||||
# comments: '<!-- @comment@ -->',
|
# comments: '<!-- @comment@ -->',
|
||||||
# fhead: '<schemalist>',
|
# fhead: '<schemalist>',
|
||||||
# vhead: ' <@type@ id="org.gtk.teleportapp.@EnumName@">',
|
# vhead: ' <@type@ id="org.gtk.teleport.@EnumName@">',
|
||||||
# vprod: ' <value nick="@valuenick@" value="@valuenum@"/>',
|
# vprod: ' <value nick="@valuenick@" value="@valuenum@"/>',
|
||||||
# vtail: ' </@type@>',
|
# vtail: ' </@type@>',
|
||||||
# ftail: '</schemalist>',
|
# ftail: '</schemalist>',
|
||||||
# install_header: true,
|
# install_header: true,
|
||||||
# install_dir: teleportapp_schemadir
|
# install_dir: teleport_schemadir
|
||||||
#)
|
#)
|
||||||
|
|
||||||
install_data(
|
install_data(
|
||||||
'com.frac_tion.teleport.gschema.xml',
|
'com.frac_tion.teleport.gschema.xml',
|
||||||
install_dir: teleportapp_schemadir
|
install_dir: teleport_schemadir
|
||||||
)
|
)
|
||||||
|
|
||||||
#subdir('appdata')
|
#subdir('appdata')
|
||||||
|
|||||||
62
meson.build
62
meson.build
@@ -1,5 +1,5 @@
|
|||||||
project(
|
project(
|
||||||
'teleportapp',
|
'teleport',
|
||||||
'c',
|
'c',
|
||||||
version: '0.1.0',
|
version: '0.1.0',
|
||||||
license: 'AGPL3+',
|
license: 'AGPL3+',
|
||||||
@@ -7,36 +7,36 @@ project(
|
|||||||
meson_version: '>= 0.40.0'
|
meson_version: '>= 0.40.0'
|
||||||
)
|
)
|
||||||
|
|
||||||
teleportapp_version = meson.project_version()
|
teleport_version = meson.project_version()
|
||||||
version_array = teleportapp_version.split('.')
|
version_array = teleport_version.split('.')
|
||||||
teleportapp_major_version = version_array[0].to_int()
|
teleport_major_version = version_array[0].to_int()
|
||||||
teleportapp_minor_version = version_array[1].to_int()
|
teleport_minor_version = version_array[1].to_int()
|
||||||
teleportapp_micro_version = version_array[2].to_int()
|
teleport_micro_version = version_array[2].to_int()
|
||||||
|
|
||||||
teleportapp_gir_namespace = 'Gtd'
|
teleport_gir_namespace = 'Gtd'
|
||||||
teleportapp_gir_version = '1.0'
|
teleport_gir_version = '1.0'
|
||||||
|
|
||||||
teleportapp_prefix = get_option('prefix')
|
teleport_prefix = get_option('prefix')
|
||||||
teleportapp_bindir = join_paths(teleportapp_prefix, get_option('bindir'))
|
teleport_bindir = join_paths(teleport_prefix, get_option('bindir'))
|
||||||
teleportapp_datadir = join_paths(teleportapp_prefix, get_option('datadir'))
|
teleport_datadir = join_paths(teleport_prefix, get_option('datadir'))
|
||||||
teleportapp_includedir = join_paths(teleportapp_prefix, get_option('includedir'))
|
teleport_includedir = join_paths(teleport_prefix, get_option('includedir'))
|
||||||
teleportapp_libdir = join_paths(teleportapp_prefix, get_option('libdir'))
|
teleport_libdir = join_paths(teleport_prefix, get_option('libdir'))
|
||||||
teleportapp_libexecdir = join_paths(teleportapp_prefix, get_option('libexecdir'))
|
teleport_libexecdir = join_paths(teleport_prefix, get_option('libexecdir'))
|
||||||
teleportapp_localedir = join_paths(teleportapp_prefix, get_option('localedir'))
|
teleport_localedir = join_paths(teleport_prefix, get_option('localedir'))
|
||||||
|
|
||||||
teleportapp_pkgdatadir = join_paths(teleportapp_datadir, meson.project_name())
|
teleport_pkgdatadir = join_paths(teleport_datadir, meson.project_name())
|
||||||
teleportapp_pkgincludedir = join_paths(teleportapp_includedir, meson.project_name())
|
teleport_pkgincludedir = join_paths(teleport_includedir, meson.project_name())
|
||||||
teleportapp_pkglibdir = join_paths(teleportapp_libdir, meson.project_name())
|
teleport_pkglibdir = join_paths(teleport_libdir, meson.project_name())
|
||||||
|
|
||||||
teleportapp_pluginsdir = join_paths(teleportapp_pkglibdir, 'plugins')
|
teleport_pluginsdir = join_paths(teleport_pkglibdir, 'plugins')
|
||||||
teleportapp_schemadir = join_paths(teleportapp_datadir, 'glib-2.0', 'schemas')
|
teleport_schemadir = join_paths(teleport_datadir, 'glib-2.0', 'schemas')
|
||||||
|
|
||||||
soversion = 0
|
soversion = 0
|
||||||
current = 0
|
current = 0
|
||||||
revision = 0
|
revision = 0
|
||||||
libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
|
libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
|
||||||
|
|
||||||
teleportapp_debug = get_option('buildtype').contains('debug')
|
teleport_debug = get_option('buildtype').contains('debug')
|
||||||
|
|
||||||
cc = meson.get_compiler('c')
|
cc = meson.get_compiler('c')
|
||||||
|
|
||||||
@@ -45,19 +45,19 @@ config_h = configuration_data()
|
|||||||
config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name())
|
config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name())
|
||||||
|
|
||||||
# debug options
|
# debug options
|
||||||
config_h.set('GNOME_TODO_ENABLE_DEBUG', teleportapp_debug)
|
config_h.set('GNOME_TODO_ENABLE_DEBUG', teleport_debug)
|
||||||
config_h.set('NDEBUG', not teleportapp_debug)
|
config_h.set('NDEBUG', not teleport_debug)
|
||||||
|
|
||||||
# package
|
# package
|
||||||
set_defines = [
|
set_defines = [
|
||||||
['PACKAGE', meson.project_name()],
|
['PACKAGE', meson.project_name()],
|
||||||
['PACKAGE_BUGREPORT', 'http://bugzilla.gnome.org/enter_bug.cgi?product=' + meson.project_name()],
|
['PACKAGE_BUGREPORT', 'http://bugzilla.gnome.org/enter_bug.cgi?product=' + meson.project_name()],
|
||||||
['PACKAGE_NAME', meson.project_name()],
|
['PACKAGE_NAME', meson.project_name()],
|
||||||
['PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), teleportapp_version)],
|
['PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), teleport_version)],
|
||||||
['PACKAGE_TARNAME', meson.project_name()],
|
['PACKAGE_TARNAME', meson.project_name()],
|
||||||
['PACKAGE_URL', 'https://wiki.gnome.org/Apps/Todo'],
|
['PACKAGE_URL', 'https://wiki.gnome.org/Apps/Todo'],
|
||||||
['PACKAGE_VERSION', teleportapp_version],
|
['PACKAGE_VERSION', teleport_version],
|
||||||
['VERSION', teleportapp_version],
|
['VERSION', teleport_version],
|
||||||
# i18n
|
# i18n
|
||||||
['GETTEXT_PACKAGE', meson.project_name()]
|
['GETTEXT_PACKAGE', meson.project_name()]
|
||||||
]
|
]
|
||||||
@@ -108,7 +108,7 @@ endforeach
|
|||||||
common_flags = ['-DHAVE_CONFIG_H']
|
common_flags = ['-DHAVE_CONFIG_H']
|
||||||
compiler_flags = []
|
compiler_flags = []
|
||||||
|
|
||||||
if teleportapp_debug
|
if teleport_debug
|
||||||
test_cflags = [
|
test_cflags = [
|
||||||
'-fno-strict-aliasing',
|
'-fno-strict-aliasing',
|
||||||
'-Wcast-align',
|
'-Wcast-align',
|
||||||
@@ -149,7 +149,7 @@ add_project_arguments(common_flags + compiler_flags, language: 'c')
|
|||||||
glib_dep = dependency('glib-2.0', version: '>= 2.43.4')
|
glib_dep = dependency('glib-2.0', version: '>= 2.43.4')
|
||||||
gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.0')
|
gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.0')
|
||||||
|
|
||||||
teleportapp_deps = [
|
teleport_deps = [
|
||||||
glib_dep,
|
glib_dep,
|
||||||
gtk_dep,
|
gtk_dep,
|
||||||
dependency('gio-2.0', version: '>= 2.43.4'),
|
dependency('gio-2.0', version: '>= 2.43.4'),
|
||||||
@@ -186,12 +186,12 @@ subdir('po')
|
|||||||
|
|
||||||
meson.add_install_script('meson_post_install.py')
|
meson.add_install_script('meson_post_install.py')
|
||||||
|
|
||||||
output = '\n teleportapp ' + teleportapp_version + '\n'
|
output = '\n teleport ' + teleport_version + '\n'
|
||||||
output += ' ==================\n\n'
|
output += ' ==================\n\n'
|
||||||
output += ' prefix: ' + teleportapp_prefix + '\n'
|
output += ' prefix: ' + teleport_prefix + '\n'
|
||||||
output += ' compiler: ' + cc.get_id() + '\n'
|
output += ' compiler: ' + cc.get_id() + '\n'
|
||||||
output += ' global flags: ' + ' '.join(compiler_flags) + ' '.join(get_option('c_link_args')) + '\n'
|
output += ' global flags: ' + ' '.join(compiler_flags) + ' '.join(get_option('c_link_args')) + '\n'
|
||||||
output += ' release: ' + (not teleportapp_debug).to_string() + '\n'
|
output += ' release: ' + (not teleport_debug).to_string() + '\n'
|
||||||
#output += ' documentation: ' + enable_gtk_doc.to_string() + '\n'
|
#output += ' documentation: ' + enable_gtk_doc.to_string() + '\n'
|
||||||
output += ' Plugins:\n\n'
|
output += ' Plugins:\n\n'
|
||||||
#output += ' Dark theme .............. ' + get_option('enable-dark-theme-plugin').to_string() + '\n'
|
#output += ' Dark theme .............. ' + get_option('enable-dark-theme-plugin').to_string() + '\n'
|
||||||
|
|||||||
4
src/.gitignore
vendored
4
src/.gitignore
vendored
@@ -24,7 +24,5 @@ _libs
|
|||||||
/main.o
|
/main.o
|
||||||
/resources.c
|
/resources.c
|
||||||
/resources.o
|
/resources.o
|
||||||
/teleportapp
|
/teleport
|
||||||
/teleportapp.o
|
|
||||||
/teleportappwin.o
|
|
||||||
test_download
|
test_download
|
||||||
|
|||||||
12
src/Makefile
12
src/Makefile
@@ -4,25 +4,25 @@ CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0 avahi-client libsoup-2.4)
|
|||||||
LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0 avahi-client libsoup-2.4)
|
LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0 avahi-client libsoup-2.4)
|
||||||
GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
|
GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
|
||||||
|
|
||||||
SRC = teleportapp.c teleportappwin.c teleportpeer.c main.c browser.c publish.c server.c get.c
|
SRC = teleport.c teleportwin.c teleportpeer.c main.c browser.c publish.c server.c get.c
|
||||||
BUILT_SRC = resources.c
|
BUILT_SRC = resources.c
|
||||||
|
|
||||||
OBJS = $(BUILT_SRC:.c=.o) $(SRC:.c=.o)
|
OBJS = $(BUILT_SRC:.c=.o) $(SRC:.c=.o)
|
||||||
|
|
||||||
all: teleportapp
|
all: teleport
|
||||||
|
|
||||||
resources.c: teleportapp.gresource.xml window.ui settings.ui remote_list.ui
|
resources.c: teleport.gresource.xml window.ui settings.ui remote_list.ui
|
||||||
$(GLIB_COMPILE_RESOURCES) teleportapp.gresource.xml --target=$@ --sourcedir=. --generate-source
|
$(GLIB_COMPILE_RESOURCES) teleport.gresource.xml --target=$@ --sourcedir=. --generate-source
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
$(CC) -c -o $(@F) $(CFLAGS) $<
|
$(CC) -c -o $(@F) $(CFLAGS) $<
|
||||||
|
|
||||||
teleportapp: $(OBJS)
|
teleport: $(OBJS)
|
||||||
$(CC) -o $(@F) $(OBJS) $(LIBS)
|
$(CC) -o $(@F) $(OBJS) $(LIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(BUILT_SRC)
|
rm -f $(BUILT_SRC)
|
||||||
rm -f $(OBJS)
|
rm -f $(OBJS)
|
||||||
rm -f teleportapp
|
rm -f teleport
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ sources = files(
|
|||||||
|
|
||||||
sources += gnome.compile_resources(
|
sources += gnome.compile_resources(
|
||||||
'gtd-resources',
|
'gtd-resources',
|
||||||
join_paths(data_dir, 'teleportapp.gresource.xml'),
|
join_paths(data_dir, 'teleport.gresource.xml'),
|
||||||
source_dir: [ data_dir, join_paths(meson.build_root(), 'plugins') ],
|
source_dir: [ data_dir, join_paths(meson.build_root(), 'plugins') ],
|
||||||
c_name: 'teleportapp',
|
c_name: 'teleport',
|
||||||
# dependencies: plugins_confs,
|
# dependencies: plugins_confs,
|
||||||
export: true
|
export: true
|
||||||
)
|
)
|
||||||
@@ -57,11 +57,11 @@ incs = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
cflags = [
|
cflags = [
|
||||||
'-DPACKAGE_DATA_DIR="@0@"'.format(teleportapp_pkgdatadir),
|
'-DPACKAGE_DATA_DIR="@0@"'.format(teleport_pkgdatadir),
|
||||||
'-DPACKAGE_LIB_DIR="@0@"'.format(teleportapp_pkglibdir),
|
'-DPACKAGE_LIB_DIR="@0@"'.format(teleport_pkglibdir),
|
||||||
'-DPACKAGE_LOCALE_DIR="@0@"'.format(teleportapp_localedir),
|
'-DPACKAGE_LOCALE_DIR="@0@"'.format(teleport_localedir),
|
||||||
'-DPACKAGE_SRC_DIR="@0@"'.format(meson.current_source_dir()),
|
'-DPACKAGE_SRC_DIR="@0@"'.format(meson.current_source_dir()),
|
||||||
'-DUI_DATA_DIR="@0@"'.format(join_paths(teleportapp_pkgdatadir, 'style'))
|
'-DUI_DATA_DIR="@0@"'.format(join_paths(teleport_pkgdatadir, 'style'))
|
||||||
]
|
]
|
||||||
|
|
||||||
ldflags = [ '-Wl,--export-dynamic' ]
|
ldflags = [ '-Wl,--export-dynamic' ]
|
||||||
@@ -76,19 +76,19 @@ ldflags = [ '-Wl,--export-dynamic' ]
|
|||||||
|
|
||||||
|
|
||||||
###############
|
###############
|
||||||
# teleportapp #
|
# teleport #
|
||||||
###############
|
###############
|
||||||
|
|
||||||
teleportapp = executable(
|
teleport = executable(
|
||||||
meson.project_name(),
|
meson.project_name(),
|
||||||
sources,
|
sources,
|
||||||
include_directories: incs,
|
include_directories: incs,
|
||||||
dependencies: teleportapp_deps,
|
dependencies: teleport_deps,
|
||||||
c_args: cflags,
|
c_args: cflags,
|
||||||
#link_with: plugins_libs,
|
#link_with: plugins_libs,
|
||||||
link_args: ldflags,
|
link_args: ldflags,
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: teleportapp_bindir
|
install_dir: teleport_bindir
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -102,13 +102,13 @@ libgtd = shared_library(
|
|||||||
version: libversion,
|
version: libversion,
|
||||||
soversion: soversion,
|
soversion: soversion,
|
||||||
include_directories: incs,
|
include_directories: incs,
|
||||||
dependencies: teleportapp_deps,
|
dependencies: teleport_deps,
|
||||||
c_args: cflags
|
c_args: cflags
|
||||||
)
|
)
|
||||||
|
|
||||||
libgtd_dep = declare_dependency(
|
libgtd_dep = declare_dependency(
|
||||||
link_with: libgtd,
|
link_with: libgtd,
|
||||||
include_directories: src_inc,
|
include_directories: src_inc,
|
||||||
dependencies: teleportapp_deps
|
dependencies: teleport_deps
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user