build: use more install_data, fix description.xml translations

Author: gkarsay

create_oxt.sh

@@ -37,5 +37,6 @@ zip -r "$OXT" \
 	toolbar \
 	description.xml
 
-cd "$BUILD_ROOT"/po &&
-zip -r "$OXT" locale
+cd "$BUILD_ROOT" && cp -r po/ locale/
+zip -r "$OXT" locale
+rm -r locale/

extension/asr/meson.build

@@ -0,0 +1,4 @@
+install_data(
+	[ 'jobs.xcu' ],
+	install_dir: join_paths(extension_dir, 'asr'),
+)

extension/i18n_description.sh

@@ -8,6 +8,8 @@ MESON_BUILD_ROOT="$2"
 SOURCE_DIR="$MESON_SOURCE_ROOT"/extension
 BUILD_DIR="$MESON_BUILD_ROOT"/extension
 
+cp "$BUILD_DIR"/description.xml.in "$BUILD_DIR"/description.xml
+
 # First get the english text
 
 mkdir -p "$BUILD_DIR"/description
@@ -27,9 +29,8 @@ do
 		if [ "$string" != "" ]
 		then
 			echo "$string" > "$BUILD_DIR"/description/desc_"$lang".txt
-			sed "/.*\/extension-description/i <src xlink:href=\"description/desc_$lang.txt\" lang=\"$lang\" />" \
-				"$BUILD_DIR"/description.xml.in \
-				> "$BUILD_DIR"/description.xml
+			sed -i "/.*\/extension-description/ i\    <src xlink:href=\"description/desc_$lang.txt\" lang=\"$lang\" />" \
+				"$BUILD_DIR"/description.xml
 		fi
 	fi
 done < "$MESON_SOURCE_ROOT"/po/LINGUAS

extension/images/meson.build

@@ -0,0 +1,10 @@
+install_data(
+	[ 'chainframes.png',
+	  'icon_24.png',
+	  'icon_48.png',
+	  'lc_chainframes.png',
+	  'lc_timefield.png',
+	  'sc_chainframes.png',
+	  'sc_timefield.png' ],
+	install_dir: join_paths(extension_dir, 'images')
+)

extension/meson.build

@@ -41,20 +41,11 @@ subdir('options')
 subdir('toolbar')
 
 if bundled
+	subdir('asr')
+	subdir('images')
 	subdir('python')
-
-	install_subdir(
-		'asr',
-		install_dir: extension_dir,
-	)
-
 	install_subdir(
 		join_paths(meson.current_build_dir(), 'description'),
 		install_dir: extension_dir,
 	)
-
-	install_subdir(
-		'images',
-		install_dir: extension_dir
-	)
 endif

extension/python/components/meson.build

@@ -0,0 +1,9 @@
+# Install Extension
+install_data(
+	[ 'ASR.py',
+	  'OptionsDialogHandler.py',
+	  'Parlatype.py' ],
+	install_dir: join_paths(extension_dir, 'python', 'components')
+)
+
+subdir('pythonpath')

extension/python/components/pythonpath/meson.build

@@ -0,0 +1,12 @@
+install_data(
+	[ 'parlatype_utils.py',
+	  'parlatype_win32api.py' ],
+	install_dir: join_paths(extension_dir, 'python', 'components', 'pythonpath')
+)
+
+# Copy pythonpath from Extension to Macros
+install_data(
+	[ 'parlatype_utils.py',
+	  'parlatype_win32api.py' ],
+	install_dir: join_paths(script_dir, 'components', 'pythonpath')
+)

extension/python/macros/meson.build

@@ -0,0 +1,6 @@
+# Install Macros
+install_data(
+	'Macros.py',
+	rename: 'Parlatype.py',
+	install_dir: join_paths(script_dir, 'macros')
+)

extension/python/meson.build

@@ -1,18 +1,2 @@
-# Install Extension
-install_subdir(
-	'components',
-	install_dir: join_paths(extension_dir, 'python')
-)
-
-# Install Macros
-install_data(
-	'macros/Macros.py',
-	rename: 'Parlatype.py',
-	install_dir: script_dir,
-)
-
-# Copy pythonpath from Extension to Macros
-install_subdir(
-	'components/pythonpath',
-	install_dir: script_dir,
-)
+subdir('components')
+subdir('macros')

po/meson.build

@@ -2,11 +2,4 @@ i18n.gettext(
 	'parlatype_lo',
 	data_dirs: [ '.' ],
 	install_dir: join_paths(extension_dir, 'locale')
-)
-
-if bundled
-	install_subdir(
-		join_paths(meson.current_build_dir(), 'locale'),
-		install_dir: extension_dir,
-	)
-endif
+)