[SailfishDevel] Ignoring source control directory in the final rpm

Juho Rutila juho.rutila at iki.fi
Tue Jan 27 04:10:18 UTC 2015


Hi Reto,

thanks for the hints. I ended up doing this (for future references):

--snip--
diff --git a/harbour-newsblur.pro b/harbour-newsblur.pro
index 08c0197..b564845 100644
--- a/harbour-newsblur.pro
+++ b/harbour-newsblur.pro
@@ -12,14 +12,12 @@
 # The name of your application
 TARGET = harbour-newsblur

-CONFIG += sailfishapp
+CONFIG += sailfishapp \
+          sailfishapp_no_deploy_qml

 SOURCES += src/harbour-newsblur.cpp

 OTHER_FILES += qml/harbour-newsblur.qml \
-    qml/cover/CoverPage.qml \
-    qml/pages/FirstPage.qml \
-    qml/pages/SecondPage.qml \
     rpm/harbour-newsblur.changes.in \
     rpm/harbour-newsblur.spec \
     rpm/harbour-newsblur.yaml \
@@ -44,7 +42,13 @@ OTHER_FILES += qml/harbour-newsblur.qml \
     qml/provider/api.js \
     qml/provider/FeedItem.qml \
     qml/provider/Api.qml \
-    qml/provider/AboutPage.qml
+    qml/provider/AboutPage.qml \
+    qml/harbour-newsblur.qml
+
+qml.files += qml
+unix:qml.extra = rm -Rf
/home/mersdk/share/SailfishProjects/harbour-newsblur/qml/feedlib/.git
+qml.path = /usr/share/$${TARGET}
+INSTALLS += qml

 # to disable building translations every time, comment out the
 # following CONFIG line
--snip--

Don't know if this the correct way to do it, but at least the .git
directory is gone.

Cheers,
Juho


On Fri, Jan 23, 2015 at 4:31 PM, Reto Zingg <reto.zingg at jolla.com> wrote:

> Hi,
>
> On 23.01.2015 15:30, Juho Rutila wrote:
>
>> Hi Reto,
>>
>> I didn't spot any wildcards, but the project is on
>> https://github.com/jrutila/harbour-newsblur
>>
>
> hmm ok, I see the problem.
>
> It's configured as "sailfishapp":
> https://github.com/jrutila/harbour-newsblur/blob/master/
> harbour-newsblur.pro#L15
>
> which drags in this:
> https://github.com/sailfish-sdk/libsailfishapp/blob/
> master/data/sailfishapp.prf#L40-L45
>
> so it's takes the whole qml folder in.
>
> I guess the easiest would be to set the "sailfishapp_no_deploy_qml" so
> that this part (L40-L45) of the prf file is not taken in and take care of
> deploying the files in qml folder by yourself and ensure it does not
> include the .git folder.
>
> best regards
> Reto
>
>
>
>> Thanks for you help,
>> -Juho
>>
>>
>> On Fri, Jan 23, 2015 at 9:38 AM, Reto Zingg <reto.zingg at jolla.com> wrote:
>>
>>  Hi,
>>>
>>>
>>> On 23.01.2015 08:53, Juho Rutila wrote:
>>>
>>>  Hi all,
>>>>
>>>> I tried to validate an app to harbour. It was rejected because:
>>>> Paths
>>>> =====
>>>> ERROR [/usr/share/harbour-newsblur/qml/feedlib/.git] Source control
>>>> directories must not be included
>>>>
>>>> The reason for this is that I have a git submodule in the feedlib
>>>> directory. What should I add and where to ignore the .git directory in
>>>> there? I think it should be in .pro-file in the OTHER_FILES or
>>>> something.
>>>>
>>>>
>>>>  Yes it's very likely that you have some wildcard inclusion for a whole
>>> folder, which contains the .git, in a .pro file.
>>>
>>> Without your pro files and knowing your folder structure, it's a little
>>> bit difficult to spot the exact problem :)
>>> Do you have the project somewhere open in a repository?
>>> Or could you provide the relevant .pro files and the directory structure?
>>>
>>> Thanks and best regards
>>> Reto
>>>
>>>   Regards,
>>>
>>>> Juho
>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> SailfishOS.org Devel mailing list
>>>> To unsubscribe, please send a mail to devel-unsubscribe at lists.
>>>> sailfishos.org
>>>>
>>>>
>>>>  _______________________________________________
>>> SailfishOS.org Devel mailing list
>>> To unsubscribe, please send a mail to devel-unsubscribe at lists.
>>> sailfishos.org
>>>
>>>
>>
>>
>> _______________________________________________
>> SailfishOS.org Devel mailing list
>> To unsubscribe, please send a mail to devel-unsubscribe at lists.
>> sailfishos.org
>>
>>
> _______________________________________________
> SailfishOS.org Devel mailing list
> To unsubscribe, please send a mail to devel-unsubscribe at lists.
> sailfishos.org
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.sailfishos.org/pipermail/devel/attachments/20150127/dd294f4a/attachment.html>


More information about the Devel mailing list