Skip to content
Extraits de code Groupes Projets
Vérifiée Valider a4a3611d rédigé par Kubat's avatar Kubat
Parcourir les fichiers

APPIMAGE: Don't download utilisties if they are already here

parent bf08aac0
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!139Add Appimage builds for lektord, lkt and klkt
Afficher les modifications d'espaces
En ligne Côte à côte
Makefile.in
+ 2
− 0
Voir le fichier @ a4a3611d
...@@ -285,6 +285,7 @@ LIBOBJS = @LIBOBJS@ ...@@ -285,6 +285,7 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@ LIPO = @LIPO@
LKT_APPIMAGETOOL = @LKT_APPIMAGETOOL@
LKT_BUILD_STRING = @LKT_BUILD_STRING@ LKT_BUILD_STRING = @LKT_BUILD_STRING@
LKT_COMPILER = @LKT_COMPILER@ LKT_COMPILER = @LKT_COMPILER@
LKT_DEBUG_ENABLED = @LKT_DEBUG_ENABLED@ LKT_DEBUG_ENABLED = @LKT_DEBUG_ENABLED@
...@@ -292,6 +293,7 @@ LKT_ENDIANES_BIG = @LKT_ENDIANES_BIG@ ...@@ -292,6 +293,7 @@ LKT_ENDIANES_BIG = @LKT_ENDIANES_BIG@
LKT_ENDIANES_LITTLE = @LKT_ENDIANES_LITTLE@ LKT_ENDIANES_LITTLE = @LKT_ENDIANES_LITTLE@
LKT_LIB_DIR = @LKT_LIB_DIR@ LKT_LIB_DIR = @LKT_LIB_DIR@
LKT_LIB_LINK = @LKT_LIB_LINK@ LKT_LIB_LINK = @LKT_LIB_LINK@
LKT_LINUXDEPLOY = @LKT_LINUXDEPLOY@
LKT_MAN_BINARY = @LKT_MAN_BINARY@ LKT_MAN_BINARY = @LKT_MAN_BINARY@
LKT_PATH_BUILD = @LKT_PATH_BUILD@ LKT_PATH_BUILD = @LKT_PATH_BUILD@
LKT_PATH_SOURCE = @LKT_PATH_SOURCE@ LKT_PATH_SOURCE = @LKT_PATH_SOURCE@
......
configure
+ 28
− 12
Voir le fichier @ a4a3611d
...@@ -668,6 +668,8 @@ LKT_KLKT_TRUE ...@@ -668,6 +668,8 @@ LKT_KLKT_TRUE
LKT_STATIC_MODULE LKT_STATIC_MODULE
LKT_STATIC_MODULE_FALSE LKT_STATIC_MODULE_FALSE
LKT_STATIC_MODULE_TRUE LKT_STATIC_MODULE_TRUE
LKT_LINUXDEPLOY
LKT_APPIMAGETOOL
CHMOD CHMOD
WGET WGET
PATCHELF PATCHELF
...@@ -17474,13 +17476,17 @@ fi ...@@ -17474,13 +17476,17 @@ fi
as_fn_error $? "chmod is required for AppImage" "$LINENO" 5 as_fn_error $? "chmod is required for AppImage" "$LINENO" 5
fi fi
   
# TODO: Don't download if binaries are already here LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool.AppImage"
LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy.AppImage"
   
# Download the AppImage creation tool, transforms the AppDir into an AppImage # Download the AppImage creation tool, transforms the AppDir into an AppImage
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Downloading AppImage creation tool" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking AppImage creation tool" >&5
$as_echo_n "checking Downloading AppImage creation tool... " >&6; } $as_echo_n "checking AppImage creation tool... " >&6; }
if test ! -x "$LKT_APPIMAGETOOL" ; then
$WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage \ $WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage \
-O $LKT_PATH_SOURCE/utils/appimagetool.AppImage -o config.wget.log -O $LKT_APPIMAGETOOL -o config.wget.log
$CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage $CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage
if test $? -eq 0 ; then : if test $? -eq 0 ; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
...@@ -17490,12 +17496,18 @@ else ...@@ -17490,12 +17496,18 @@ else
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed as_fn_error $? "failed
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5; }
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: already downloaded" >&5
$as_echo "already downloaded" >&6; }
fi fi
   
# Downlaod the AppDir management tool, create the AppDir # Downlaod the AppDir management tool, create the AppDir
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Downloading LinuxDeploy creation tool" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking LinuxDeploy creation tool" >&5
$as_echo_n "checking Downloading LinuxDeploy creation tool... " >&6; } $as_echo_n "checking LinuxDeploy creation tool... " >&6; }
$WGET https://martinm.iiens.net/linuxdeploy -O $LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage -a config.wget.log if test ! -x "$LKT_LINUXDEPLOY" ; then
$WGET https://martinm.iiens.net/linuxdeploy \
-O $LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage -a config.wget.log
$CHMOD 00700 $LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage $CHMOD 00700 $LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage
if test $? -eq 0 ; then : if test $? -eq 0 ; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
...@@ -17505,6 +17517,10 @@ else ...@@ -17505,6 +17517,10 @@ else
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed as_fn_error $? "failed
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5; }
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: already downloaded" >&5
$as_echo "already downloaded" >&6; }
fi fi
   
# Override prefix var for each executable # Override prefix var for each executable
......
configure.ac
+ 22
− 10
Voir le fichier @ a4a3611d
...@@ -113,20 +113,32 @@ AS_IF([test "x${LKT_APPIMAGE}" = "xyes"], [ ...@@ -113,20 +113,32 @@ AS_IF([test "x${LKT_APPIMAGE}" = "xyes"], [
AS_IF([test "$WGET" = "notfound"], [AC_MSG_ERROR([wget is required for AppImage]) ]) AS_IF([test "$WGET" = "notfound"], [AC_MSG_ERROR([wget is required for AppImage]) ])
AS_IF([test "$CHMOD" = "notfound"], [AC_MSG_ERROR([chmod is required for AppImage]) ]) AS_IF([test "$CHMOD" = "notfound"], [AC_MSG_ERROR([chmod is required for AppImage]) ])
# TODO: Don't download if binaries are already here LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool.AppImage"
LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy.AppImage"
AC_SUBST([LKT_APPIMAGETOOL])
AC_SUBST([LKT_LINUXDEPLOY])
# Download the AppImage creation tool, transforms the AppDir into an AppImage # Download the AppImage creation tool, transforms the AppDir into an AppImage
AC_MSG_CHECKING([Downloading AppImage creation tool]) AC_MSG_CHECKING([AppImage creation tool])
if test ! -x "$LKT_APPIMAGETOOL" ; then
$WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage \ $WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage \
-O $LKT_PATH_SOURCE/utils/appimagetool.AppImage -o config.wget.log -O $LKT_APPIMAGETOOL -o config.wget.log
$CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage $CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage
AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([done])], [AC_MSG_FAILURE([failed])]) AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([done])], [AC_MSG_FAILURE([failed])])
else
AC_MSG_RESULT([already downloaded])
fi
# Downlaod the AppDir management tool, create the AppDir # Downlaod the AppDir management tool, create the AppDir
AC_MSG_CHECKING([Downloading LinuxDeploy creation tool]) AC_MSG_CHECKING([LinuxDeploy creation tool])
$WGET https://martinm.iiens.net/linuxdeploy -O $LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage -a config.wget.log if test ! -x "$LKT_LINUXDEPLOY" ; then
$WGET https://martinm.iiens.net/linuxdeploy \
-O $LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage -a config.wget.log
$CHMOD 00700 $LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage $CHMOD 00700 $LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage
AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([done])], [AC_MSG_FAILURE([failed])]) AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([done])], [AC_MSG_FAILURE([failed])])
else
AC_MSG_RESULT([already downloaded])
fi
# Override prefix var for each executable # Override prefix var for each executable
# TODO: Find another way, don't override prefix # TODO: Find another way, don't override prefix
......
inc/Makefile.in
+ 2
− 0
Voir le fichier @ a4a3611d
...@@ -216,6 +216,7 @@ LIBOBJS = @LIBOBJS@ ...@@ -216,6 +216,7 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@ LIPO = @LIPO@
LKT_APPIMAGETOOL = @LKT_APPIMAGETOOL@
LKT_BUILD_STRING = @LKT_BUILD_STRING@ LKT_BUILD_STRING = @LKT_BUILD_STRING@
LKT_COMPILER = @LKT_COMPILER@ LKT_COMPILER = @LKT_COMPILER@
LKT_DEBUG_ENABLED = @LKT_DEBUG_ENABLED@ LKT_DEBUG_ENABLED = @LKT_DEBUG_ENABLED@
...@@ -223,6 +224,7 @@ LKT_ENDIANES_BIG = @LKT_ENDIANES_BIG@ ...@@ -223,6 +224,7 @@ LKT_ENDIANES_BIG = @LKT_ENDIANES_BIG@
LKT_ENDIANES_LITTLE = @LKT_ENDIANES_LITTLE@ LKT_ENDIANES_LITTLE = @LKT_ENDIANES_LITTLE@
LKT_LIB_DIR = @LKT_LIB_DIR@ LKT_LIB_DIR = @LKT_LIB_DIR@
LKT_LIB_LINK = @LKT_LIB_LINK@ LKT_LIB_LINK = @LKT_LIB_LINK@
LKT_LINUXDEPLOY = @LKT_LINUXDEPLOY@
LKT_MAN_BINARY = @LKT_MAN_BINARY@ LKT_MAN_BINARY = @LKT_MAN_BINARY@
LKT_PATH_BUILD = @LKT_PATH_BUILD@ LKT_PATH_BUILD = @LKT_PATH_BUILD@
LKT_PATH_SOURCE = @LKT_PATH_SOURCE@ LKT_PATH_SOURCE = @LKT_PATH_SOURCE@
......
man/Makefile.in
+ 2
− 0
Voir le fichier @ a4a3611d
...@@ -198,6 +198,7 @@ LIBOBJS = @LIBOBJS@ ...@@ -198,6 +198,7 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@ LIPO = @LIPO@
LKT_APPIMAGETOOL = @LKT_APPIMAGETOOL@
LKT_BUILD_STRING = @LKT_BUILD_STRING@ LKT_BUILD_STRING = @LKT_BUILD_STRING@
LKT_COMPILER = @LKT_COMPILER@ LKT_COMPILER = @LKT_COMPILER@
LKT_DEBUG_ENABLED = @LKT_DEBUG_ENABLED@ LKT_DEBUG_ENABLED = @LKT_DEBUG_ENABLED@
...@@ -205,6 +206,7 @@ LKT_ENDIANES_BIG = @LKT_ENDIANES_BIG@ ...@@ -205,6 +206,7 @@ LKT_ENDIANES_BIG = @LKT_ENDIANES_BIG@
LKT_ENDIANES_LITTLE = @LKT_ENDIANES_LITTLE@ LKT_ENDIANES_LITTLE = @LKT_ENDIANES_LITTLE@
LKT_LIB_DIR = @LKT_LIB_DIR@ LKT_LIB_DIR = @LKT_LIB_DIR@
LKT_LIB_LINK = @LKT_LIB_LINK@ LKT_LIB_LINK = @LKT_LIB_LINK@
LKT_LINUXDEPLOY = @LKT_LINUXDEPLOY@
LKT_MAN_BINARY = @LKT_MAN_BINARY@ LKT_MAN_BINARY = @LKT_MAN_BINARY@
LKT_PATH_BUILD = @LKT_PATH_BUILD@ LKT_PATH_BUILD = @LKT_PATH_BUILD@
LKT_PATH_SOURCE = @LKT_PATH_SOURCE@ LKT_PATH_SOURCE = @LKT_PATH_SOURCE@
......
src/Makefile.in
+ 2
− 0
Voir le fichier @ a4a3611d
...@@ -429,6 +429,7 @@ LIBOBJS = @LIBOBJS@ ...@@ -429,6 +429,7 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@ LIPO = @LIPO@
LKT_APPIMAGETOOL = @LKT_APPIMAGETOOL@
LKT_BUILD_STRING = @LKT_BUILD_STRING@ LKT_BUILD_STRING = @LKT_BUILD_STRING@
LKT_COMPILER = @LKT_COMPILER@ LKT_COMPILER = @LKT_COMPILER@
LKT_DEBUG_ENABLED = @LKT_DEBUG_ENABLED@ LKT_DEBUG_ENABLED = @LKT_DEBUG_ENABLED@
...@@ -436,6 +437,7 @@ LKT_ENDIANES_BIG = @LKT_ENDIANES_BIG@ ...@@ -436,6 +437,7 @@ LKT_ENDIANES_BIG = @LKT_ENDIANES_BIG@
LKT_ENDIANES_LITTLE = @LKT_ENDIANES_LITTLE@ LKT_ENDIANES_LITTLE = @LKT_ENDIANES_LITTLE@
LKT_LIB_DIR = @LKT_LIB_DIR@ LKT_LIB_DIR = @LKT_LIB_DIR@
LKT_LIB_LINK = @LKT_LIB_LINK@ LKT_LIB_LINK = @LKT_LIB_LINK@
LKT_LINUXDEPLOY = @LKT_LINUXDEPLOY@
LKT_MAN_BINARY = @LKT_MAN_BINARY@ LKT_MAN_BINARY = @LKT_MAN_BINARY@
LKT_PATH_BUILD = @LKT_PATH_BUILD@ LKT_PATH_BUILD = @LKT_PATH_BUILD@
LKT_PATH_SOURCE = @LKT_PATH_SOURCE@ LKT_PATH_SOURCE = @LKT_PATH_SOURCE@
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter