From 04c362ee1d4ed2b736310389a23ea94bdad5e9d7 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 1 Mar 2019 09:16:39 +0100 Subject: Move the .pyqtc files to .pyproject files Use the new project file format. Change-Id: I69f488c285343500edd999b746ce244a56504030 Reviewed-by: Christian Tismer --- build_scripts/build_scripts.pyproject | 9 ++ build_scripts/build_scripts.pyqtc | 18 ---- examples/examples.pyproject | 105 +++++++++++++++++++++ examples/examples.pyqtc | 103 -------------------- .../tabbedbrowser/tabbedbrowser.pyproject | 5 + .../tabbedbrowser/tabbedbrowser.pyqtc | 7 -- testing/testing.pyproject | 4 + testing/testing.pyqtc | 9 -- 8 files changed, 123 insertions(+), 137 deletions(-) create mode 100644 build_scripts/build_scripts.pyproject delete mode 100644 build_scripts/build_scripts.pyqtc create mode 100644 examples/examples.pyproject delete mode 100644 examples/examples.pyqtc create mode 100644 examples/webenginewidgets/tabbedbrowser/tabbedbrowser.pyproject delete mode 100644 examples/webenginewidgets/tabbedbrowser/tabbedbrowser.pyqtc create mode 100644 testing/testing.pyproject delete mode 100644 testing/testing.pyqtc diff --git a/build_scripts/build_scripts.pyproject b/build_scripts/build_scripts.pyproject new file mode 100644 index 000000000..604419c10 --- /dev/null +++ b/build_scripts/build_scripts.pyproject @@ -0,0 +1,9 @@ +{ + "files": ["main.py", "__init__.py", "config.py", "options.py", "qtinfo.py", + "setup_runner.py", "utils.py", "wheel_override.py", + "platforms/__init__.py", "platforms/linux.py", + "platforms/macos.py", "platforms/unix.py", + "platforms/windows_desktop.py", + "../setup.py", + "../coin_build_instructions.py", "../coin_test_instructions.py"] +} diff --git a/build_scripts/build_scripts.pyqtc b/build_scripts/build_scripts.pyqtc deleted file mode 100644 index 1fc1c9664..000000000 --- a/build_scripts/build_scripts.pyqtc +++ /dev/null @@ -1,18 +0,0 @@ -__init__.py -config.py -main.py -options.py -platforms -qtinfo.py -setup_runner.py -utils.py -wheel_override.py -platforms/__init__.py -platforms/linux.py -platforms/macos.py -platforms/unix.py -platforms/windows_desktop.py -../setup.py -../coin_build_instructions.py -../coin_test_instructions.py - diff --git a/examples/examples.pyproject b/examples/examples.pyproject new file mode 100644 index 000000000..5c96e9978 --- /dev/null +++ b/examples/examples.pyproject @@ -0,0 +1,105 @@ +{ + "files": ["charts/memoryusage.py", + "corelib/threads/mandelbrot.py", + "corelib/tools/codecs/codecs.py", + "corelib/tools/regexp.py", + "corelib/tools/settingseditor/settingseditor.py", + "declarative/extending/chapter1-basics/basics.py", + "declarative/extending/chapter2-methods/methods.py", + "declarative/extending/chapter3-bindings/bindings.py", + "declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py", + "declarative/extending/chapter5-listproperties/listproperties.py", + "declarative/scrolling.py", + "declarative/signals/pytoqml1/main.py", + "declarative/signals/qmltopy1/main.py", + "declarative/signals/qmltopy2/main.py", + "declarative/signals/qmltopy3/main.py", + "declarative/signals/qmltopy4/main.py", + "declarative/usingmodel.py", + "macextras/macpasteboardmime.py", + "multimedia/audiooutput.py", + "multimedia/camera.py", + "multimedia/player.py", + "network/blockingfortuneclient.py", + "network/fortuneclient.py", + "network/fortuneserver.py", + "network/threadedfortuneserver.py", + "opengl/2dpainting.py", + "opengl/grabber.py", + "opengl/hellogl.py", + "opengl/overpainting.py", + "opengl/samplebuffers.py", + "opengl/textures/textures.py", + "script/helloscript.py", + "texttospeech/texttospeech.py", + "tutorial/t1.py", + "tutorial/t10.py", + "tutorial/t11.py", + "tutorial/t12.py", + "tutorial/t13.py", + "tutorial/t14.py", + "tutorial/t2.py", + "tutorial/t3.py", + "tutorial/t4.py", + "tutorial/t5.py", + "tutorial/t6.py", + "tutorial/t7.py", + "tutorial/t8.py", + "tutorial/t9.py", + "webenginewidgets/simplebrowser.py", + "widgets/animation/animatedtiles/animatedtiles.py", + "widgets/animation/appchooser/appchooser.py", + "widgets/animation/easing/easing.py", + "widgets/animation/states/states.py", + "widgets/dialogs/classwizard/classwizard.py", + "widgets/dialogs/extension.py", + "widgets/dialogs/findfiles.py", + "widgets/dialogs/standarddialogs.py", + "widgets/dialogs/trivialwizard.py", + "widgets/draganddrop/draggabletext/draggabletext.py", + "widgets/effects/lighting.py", + "widgets/graphicsview/anchorlayout.py", + "widgets/graphicsview/collidingmice/collidingmice.py", + "widgets/graphicsview/diagramscene/diagramscene.py", + "widgets/graphicsview/dragdroprobot/dragdroprobot.py", + "widgets/graphicsview/elasticnodes.py", + "widgets/itemviews/addressbook/adddialogwidget.py", + "widgets/itemviews/addressbook/addressbook.py", + "widgets/itemviews/addressbook/addresswidget.py", + "widgets/itemviews/addressbook/newaddresstab.py", + "widgets/itemviews/addressbook/tablemodel.py", + "widgets/itemviews/basicsortfiltermodel.py", + "widgets/itemviews/fetchmore.py", + "widgets/itemviews/stardelegate/stardelegate.py", + "widgets/itemviews/stardelegate/stareditor.py", + "widgets/itemviews/stardelegate/starrating.py", + "widgets/layouts/basiclayouts.py", + "widgets/layouts/dynamiclayouts.py", + "widgets/layouts/flowlayout.py", + "widgets/mainwindows/application/application.py", + "widgets/mainwindows/dockwidgets/dockwidgets.py", + "widgets/mainwindows/mdi/mdi.py", + "widgets/painting/basicdrawing/basicdrawing.py", + "widgets/painting/concentriccircles.py", + "widgets/richtext/orderform.py", + "widgets/richtext/syntaxhighlighter.py", + "widgets/richtext/syntaxhighlighter/syntaxhighlighter.py", + "widgets/richtext/textobject/textobject.py", + "widgets/state-machine/eventtrans.py", + "widgets/state-machine/factstates.py", + "widgets/state-machine/pingpong.py", + "widgets/state-machine/rogue.py", + "widgets/state-machine/trafficlight.py", + "widgets/state-machine/twowaybutton.py", + "widgets/tutorials/addressbook/part1.py", + "widgets/tutorials/addressbook/part2.py", + "widgets/tutorials/addressbook/part3.py", + "widgets/tutorials/addressbook/part4.py", + "widgets/tutorials/addressbook/part5.py", + "widgets/tutorials/addressbook/part6.py", + "widgets/tutorials/addressbook/part7.py", + "widgets/widgets/hellogl_openglwidget_legacy.py", + "widgets/widgets/tetrix.py", + "xml/dombookmarks/dombookmarks.py", + "xmlpatterns/schema/schema.py"] +} diff --git a/examples/examples.pyqtc b/examples/examples.pyqtc deleted file mode 100644 index eb0e35933..000000000 --- a/examples/examples.pyqtc +++ /dev/null @@ -1,103 +0,0 @@ -charts/memoryusage.py -corelib/threads/mandelbrot.py -corelib/tools/codecs/codecs.py -corelib/tools/regexp.py -corelib/tools/settingseditor/settingseditor.py -declarative/extending/chapter1-basics/basics.py -declarative/extending/chapter2-methods/methods.py -declarative/extending/chapter3-bindings/bindings.py -declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py -declarative/extending/chapter5-listproperties/listproperties.py -declarative/scrolling.py -declarative/signals/pytoqml1/main.py -declarative/signals/qmltopy1/main.py -declarative/signals/qmltopy2/main.py -declarative/signals/qmltopy3/main.py -declarative/signals/qmltopy4/main.py -declarative/usingmodel.py -macextras/macpasteboardmime.py -multimedia/audiooutput.py -multimedia/camera.py -multimedia/player.py -network/blockingfortuneclient.py -network/fortuneclient.py -network/fortuneserver.py -network/threadedfortuneserver.py -opengl/2dpainting.py -opengl/grabber.py -opengl/hellogl.py -opengl/overpainting.py -opengl/samplebuffers.py -opengl/textures/textures.py -script/helloscript.py -texttospeech/texttospeech.py -tutorial/t1.py -tutorial/t10.py -tutorial/t11.py -tutorial/t12.py -tutorial/t13.py -tutorial/t14.py -tutorial/t2.py -tutorial/t3.py -tutorial/t4.py -tutorial/t5.py -tutorial/t6.py -tutorial/t7.py -tutorial/t8.py -tutorial/t9.py -webenginewidgets/simplebrowser.py -widgets/animation/animatedtiles/animatedtiles.py -widgets/animation/appchooser/appchooser.py -widgets/animation/easing/easing.py -widgets/animation/states/states.py -widgets/dialogs/classwizard/classwizard.py -widgets/dialogs/extension.py -widgets/dialogs/findfiles.py -widgets/dialogs/standarddialogs.py -widgets/dialogs/trivialwizard.py -widgets/draganddrop/draggabletext/draggabletext.py -widgets/effects/lighting.py -widgets/graphicsview/anchorlayout.py -widgets/graphicsview/collidingmice/collidingmice.py -widgets/graphicsview/diagramscene/diagramscene.py -widgets/graphicsview/dragdroprobot/dragdroprobot.py -widgets/graphicsview/elasticnodes.py -widgets/itemviews/addressbook/adddialogwidget.py -widgets/itemviews/addressbook/addressbook.py -widgets/itemviews/addressbook/addresswidget.py -widgets/itemviews/addressbook/newaddresstab.py -widgets/itemviews/addressbook/tablemodel.py -widgets/itemviews/basicsortfiltermodel.py -widgets/itemviews/fetchmore.py -widgets/itemviews/stardelegate/stardelegate.py -widgets/itemviews/stardelegate/stareditor.py -widgets/itemviews/stardelegate/starrating.py -widgets/layouts/basiclayouts.py -widgets/layouts/dynamiclayouts.py -widgets/layouts/flowlayout.py -widgets/mainwindows/application/application.py -widgets/mainwindows/dockwidgets/dockwidgets.py -widgets/mainwindows/mdi/mdi.py -widgets/painting/basicdrawing/basicdrawing.py -widgets/painting/concentriccircles.py -widgets/richtext/orderform.py -widgets/richtext/syntaxhighlighter.py -widgets/richtext/syntaxhighlighter/syntaxhighlighter.py -widgets/richtext/textobject/textobject.py -widgets/state-machine/eventtrans.py -widgets/state-machine/factstates.py -widgets/state-machine/pingpong.py -widgets/state-machine/rogue.py -widgets/state-machine/trafficlight.py -widgets/state-machine/twowaybutton.py -widgets/tutorials/addressbook/part1.py -widgets/tutorials/addressbook/part2.py -widgets/tutorials/addressbook/part3.py -widgets/tutorials/addressbook/part4.py -widgets/tutorials/addressbook/part5.py -widgets/tutorials/addressbook/part6.py -widgets/tutorials/addressbook/part7.py -widgets/widgets/hellogl_openglwidget_legacy.py -widgets/widgets/tetrix.py -xml/dombookmarks/dombookmarks.py -xmlpatterns/schema/schema.py diff --git a/examples/webenginewidgets/tabbedbrowser/tabbedbrowser.pyproject b/examples/webenginewidgets/tabbedbrowser/tabbedbrowser.pyproject new file mode 100644 index 000000000..1d26848b0 --- /dev/null +++ b/examples/webenginewidgets/tabbedbrowser/tabbedbrowser.pyproject @@ -0,0 +1,5 @@ +{ + "files": ["main.py", "bookmarkwidget.py", "browsertabwidget.py", + "downloadwidget.py", "findtoolbar.py", "historywindow.py", + "webengineview.py"] +} diff --git a/examples/webenginewidgets/tabbedbrowser/tabbedbrowser.pyqtc b/examples/webenginewidgets/tabbedbrowser/tabbedbrowser.pyqtc deleted file mode 100644 index b5fbffa28..000000000 --- a/examples/webenginewidgets/tabbedbrowser/tabbedbrowser.pyqtc +++ /dev/null @@ -1,7 +0,0 @@ -main.py -bookmarkwidget.py -browsertabwidget.py -downloadwidget.py -findtoolbar.py -historywindow.py -webengineview.py diff --git a/testing/testing.pyproject b/testing/testing.pyproject new file mode 100644 index 000000000..22914e5a9 --- /dev/null +++ b/testing/testing.pyproject @@ -0,0 +1,4 @@ +{ + "files": ["../testrunner.py", "blacklist.py", "buildlog.py", "command.py", + "helper.py", "__init__.py", "parser.py", "runner.py", "wheel_tester.py"] +} diff --git a/testing/testing.pyqtc b/testing/testing.pyqtc deleted file mode 100644 index 5a89e69b8..000000000 --- a/testing/testing.pyqtc +++ /dev/null @@ -1,9 +0,0 @@ -../testrunner.py -blacklist.py -buildlog.py -command.py -helper.py -__init__.py -parser.py -runner.py -wheel_tester.py -- cgit v1.2.3