Skip to contentSkip to conversation

qt5/qt5webchannel: add qwebchannel.js installation in /var/www

PATCH Superseded Julien Corjon 3 participants 6 messages Dec 23, 2015

lore
Share & tools
lore

Julien Corjon

author
#0 lore raw

PATCH v2 1/1 qt5/qt5webchannel: add qwebchannel.js installation in /var/www

To use webchannel in an application qwebchannel.js is needed but this file was not installed.

Signed-off-by Julien Corjon <[email protected]>

---
Changes v1 -> v2:
- Replace installation path choise with /var/www (suggested by Thomas)

---
 package/qt5/qt5webchannel/qt5webchannel.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/qt5/qt5webchannel/qt5webchannel.mk +6 -0
index cfb6da9..bd4257f 100644
@@ -35,6 +35,11 @@ define QT5WEBCHANNEL_INSTALL_STAGING_CMDS
 	$(QT5_LA_PRL_FILES_FIXUP)
 endef
 
+define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT
+        $(INSTALL) -m 0644 -D $(@D)/src/webchannel/qwebchannel.js \
+		$(TARGET_DIR)/var/www/qwebchannel.js
+endef
+
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
 define QT5WEBCHANNEL_INSTALL_TARGET_QMLS
 	cp -dpfr $(STAGING_DIR)/usr/qml/QtWebChannel $(TARGET_DIR)/usr/qml/

@@ -56,6 +61,7 @@ endif
 define QT5WEBCHANNEL_INSTALL_TARGET_CMDS
 	$(QT5WEBCHANNEL_INSTALL_TARGET_LIBS)
 	$(QT5WEBCHANNEL_INSTALL_TARGET_QMLS)
+	$(QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT)
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.5.0
#1 lore raw

PATCH v2 1/1 qt5/qt5webchannel: add qwebchannel.js installation in /var/www

Julien, All,

On 2015-12-23 18:04 +0100, Julien Corjon spake thusly:

Quoted 4 lines

To use webchannel in an application qwebchannel.js is needed but this file was not installed.

Signed-off-by Julien Corjon <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

However, I was having a look at our current package, and there's something really odd that struck me. If the Qt5base examples are enabled, then we define QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES but we never use it.

As it seems you're using qt5webchannels, would you care having a look at this examples stuff, please?

Regards,
Yann E. MORIN.

Quoted 38 lines

---
Changes v1 -> v2:
- Replace installation path choise with /var/www (suggested by Thomas)

---
 package/qt5/qt5webchannel/qt5webchannel.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/qt5/qt5webchannel/qt5webchannel.mk +6 -0
index cfb6da9..bd4257f 100644
@@ -35,6 +35,11 @@ define QT5WEBCHANNEL_INSTALL_STAGING_CMDS
 	$(QT5_LA_PRL_FILES_FIXUP)
 endef
 
+define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT
+        $(INSTALL) -m 0644 -D $(@D)/src/webchannel/qwebchannel.js \
+		$(TARGET_DIR)/var/www/qwebchannel.js
+endef
+
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
 define QT5WEBCHANNEL_INSTALL_TARGET_QMLS
 	cp -dpfr $(STAGING_DIR)/usr/qml/QtWebChannel $(TARGET_DIR)/usr/qml/

@@ -56,6 +61,7 @@ endif
 define QT5WEBCHANNEL_INSTALL_TARGET_CMDS
 	$(QT5WEBCHANNEL_INSTALL_TARGET_LIBS)
 	$(QT5WEBCHANNEL_INSTALL_TARGET_QMLS)
+	$(QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT)
 endef
 
 $(eval $(generic-package))
Signature · 6 lines
2.5.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#2 lore raw

PATCH v2 1/1 qt5/qt5webchannel: add qwebchannel.js installation in /var/www

Yann,

Le 23/12/2015 19:24, Yann E. MORIN a ?crit :

Quoted 6 lines

Julien, All,

On 2015-12-23 18:04 +0100, Julien Corjon spake thusly:

Quoted 3 lines

To use webchannel in an application qwebchannel.js is needed but this file was not installed.

Quoted 8 lines
Quoted 1 line
Signed-off-by Julien Corjon <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

However, I was having a look at our current package, and there's something really odd that struck me. If the Qt5base examples are enabled, then we define QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES but we never use it.

I also notice this issue yesterday but I also notice that most of the qt modules (except qt5base) compile examples but don't install them in staging and target. Only the sources files are installed.

I would like fix the examples binary install of all the Qt modules and in the mean time fix the qwebchannel examples installation.

Quoted 6 lines

As it seems you're using qt5webchannels, would you care having a look at this examples stuff, please?

Regards,
Yann E. MORIN.

Regards,

Julien

#3 lore raw

PATCH v2 1/1 qt5/qt5webchannel: add qwebchannel.js installation in /var/www

Julien, All,

On 2015-12-23 18:34 +0000, Julien CORJON spake thusly:

Quoted 14 lines

Le 23/12/2015 19:24, Yann E. MORIN a ?crit :

Quoted 4 lines

On 2015-12-23 18:04 +0100, Julien Corjon spake thusly:

Quoted 3 lines

To use webchannel in an application qwebchannel.js is needed but this file was not installed.

Quoted 8 lines
Quoted 1 line
Signed-off-by Julien Corjon <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

However, I was having a look at our current package, and there's something really odd that struck me. If the Qt5base examples are enabled, then we define QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES but we never use it.

Quoted 6 lines

I also notice this issue yesterday but I also notice that most of the qt modules (except qt5base) compile examples but don't install them in staging and target. Only the sources files are installed.

I would like fix the examples binary install of all the Qt modules and in the mean time fix the qwebchannel examples installation.

OK, be my guest then! ;-)

However, before you actually work on it, I'd like our Qt5 experts chime in and validate that something is to be fixed (may there's some underlying reason not to install them)...

Thanks!

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#4 lore raw

PATCH v2 1/1 qt5/qt5webchannel: add qwebchannel.js installation in /var/www

Yann,

Le 23/12/2015 19:42, Yann E. MORIN a ?crit :

Quoted 21 lines

Julien, All,

On 2015-12-23 18:34 +0000, Julien CORJON spake thusly:

Quoted 18 lines

Le 23/12/2015 19:24, Yann E. MORIN a ?crit :

Quoted 4 lines

On 2015-12-23 18:04 +0100, Julien Corjon spake thusly:

Quoted 3 lines

To use webchannel in an application qwebchannel.js is needed but this file was not installed.

Quoted 8 lines
Quoted 1 line
Signed-off-by Julien Corjon <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

However, I was having a look at our current package, and there's something really odd that struck me. If the Qt5base examples are enabled, then we define QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES but we never use it.

I also notice this issue yesterday but I also notice that most of the qt modules (except qt5base) compile examples but don't install them in staging and target. Only the sources files are installed.

Quoted 8 lines
Quoted 2 lines

I would like fix the examples binary install of all the Qt modules and in the mean time fix the qwebchannel examples installation.

OK, be my guest then! ;-)

However, before you actually work on it, I'd like our Qt5 experts chime in and validate that something is to be fixed (may there's some underlying reason not to install them)...

I cannot point any reason to have the source on the target (but no qmake and gcc to compile them) and no binaries...

If I want to try Qt examples I want to have only the binaries on the target and I can take a look on the sources on my host not the opposite ;)

Regards,
Julien

Applied
#5 lore raw

PATCH v2 1/1 qt5/qt5webchannel: add qwebchannel.js installation in /var/www

In reply to Julien Corjon

Dear Julien Corjon,

Quoted 10 lines · Julien Corjon

To use webchannel in an application qwebchannel.js is needed but this file was not installed.

Signed-off-by Julien Corjon <[email protected]>

---
Changes v1 -> v2:
- Replace installation path choise with /var/www (suggested by Thomas)

---
 package/qt5/qt5webchannel/qt5webchannel.mk | 6 ++++++
 1 file changed, 6 insertions(+)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com