author | mickeyl <mickeyl> | 2004-04-28 21:18:02 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-28 21:18:02 (UTC) |
commit | f567351ae81391fbe50c8f37a6dc2ff661b23f44 (patch) (side-by-side diff) | |
tree | a588d11e7a5b310c485c7a6a4aa6d773200deda3 | |
parent | f498387e7c58cd9488c9b4ed964bfb0ebeead5c8 (diff) | |
download | opie-f567351ae81391fbe50c8f37a6dc2ff661b23f44.zip opie-f567351ae81391fbe50c8f37a6dc2ff661b23f44.tar.gz opie-f567351ae81391fbe50c8f37a6dc2ff661b23f44.tar.bz2 |
CLEANUP: rsync is now a (static) library and the launcher links against it
-rw-r--r-- | config.in | 2 | ||||
-rw-r--r-- | core/launcher/server.pro | 46 | ||||
-rw-r--r-- | packages | 1 | ||||
-rw-r--r-- | rsync/config.in | 3 | ||||
-rw-r--r-- | rsync/rsync.pro | 60 |
5 files changed, 66 insertions, 46 deletions
@@ -131,97 +131,97 @@ config QT_QWS_ALLOW_OVERCLOCK default n config OPIE_HIGH_RES_SMALL_PHY boolean "Resolution is bigger than physical screen" default y if TARGET_C700 default n if ! TARGET_C700 config USE_FILE_NOTIFICATION boolean "Substitute (some) polling interfaces with OFileNotifier" default y config OPIE_NEW_ALLOC boolean "Use malloc and free for the implementation" default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP) config OPIE_NO_SOUND_PCM_READ_BITS boolean "There is not a pcm_read_bits io control" default y if TARGET_SHARP default n if ! TARGET_SHARP config OPIE_WE_VERSION_OVERRIDE boolean "Override autodetection of wireless extension (WE) version" default n config OPIE_WE_VERSION depends OPIE_WE_VERSION_OVERRIDE string "The wireless extension (WE) version to build against" default "15" if ! TARGET_X86 default "16" if TARGET_X86 endmenu menu "Dependencies" source dependencies.in endmenu menu "Base" choice prompt "Qpe Library Selection" default LIBQPE source library/config.in source x11/config.in endchoice source libopie/config.in source libopie2/config.in source libqtaux/config.in - + source rsync/config.in source core/opie-login/config.in source core/opiealarm/config.in source core/tools/quicklauncher/config.in source core/launcher/config.in source core/symlinker/config.in endmenu comment "" menu "Applets" source core/applets/config.in source noncore/applets/config.in endmenu menu "Apps" source core/apps/config.in source noncore/apps/config.in endmenu menu "Communications and Networking" source noncore/comm/config.in source noncore/net/config.in endmenu menu "Games" source noncore/games/config.in endmenu menu "Graphics and Multimedia" source freetype/config.in source noncore/graphics/config.in source core/multimedia/config.in source noncore/multimedia/config.in endmenu menu "Input methods" source inputmethods/config.in endmenu menu "Pim" source core/pim/config.in comment "Today Plugins ---" source noncore/todayplugins/config.in source core/pim/today/plugins/config.in endmenu menu "Settings" source core/settings/config.in diff --git a/core/launcher/server.pro b/core/launcher/server.pro index 25806b6..4e6a581 100644 --- a/core/launcher/server.pro +++ b/core/launcher/server.pro @@ -1,128 +1,84 @@ TEMPLATE = app CONFIG += qt warn_on DESTDIR = $$(OPIEDIR)/bin HEADERS += server.h \ serverinterface.h \ launchertab.h \ documentlist.h \ appicons.h \ taskbar.h \ runningappbar.h \ applauncher.h \ stabmon.h \ inputmethods.h \ systray.h \ wait.h \ shutdownimpl.h \ launcher.h \ launcherview.h \ $$(OPIEDIR)/core/apps/calibrate/calibrate.h \ startmenu.h \ transferserver.h \ qcopbridge.h \ packageslave.h \ irserver.h \ firstuse.h \ - $$(OPIEDIR)/rsync/buf.h \ - $$(OPIEDIR)/rsync/checksum.h \ - $$(OPIEDIR)/rsync/command.h \ - $$(OPIEDIR)/rsync/emit.h \ - $$(OPIEDIR)/rsync/job.h \ - $$(OPIEDIR)/rsync/netint.h \ - $$(OPIEDIR)/rsync/protocol.h \ - $$(OPIEDIR)/rsync/prototab.h \ - $$(OPIEDIR)/rsync/rsync.h \ - $$(OPIEDIR)/rsync/search.h \ - $$(OPIEDIR)/rsync/stream.h \ - $$(OPIEDIR)/rsync/sumset.h \ - $$(OPIEDIR)/rsync/trace.h \ - $$(OPIEDIR)/rsync/types.h \ - $$(OPIEDIR)/rsync/util.h \ - $$(OPIEDIR)/rsync/whole.h \ - $$(OPIEDIR)/rsync/config_rsync.h \ - $$(OPIEDIR)/rsync/qrsync.h \ syncdialog.h \ serverapp.h \ qprocess.h \ screensaver.h \ $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \ mediadlg.h SOURCES += server.cpp \ serverinterface.cpp \ launchertab.cpp \ documentlist.cpp \ appicons.cpp \ taskbar.cpp \ runningappbar.cpp \ applauncher.cpp \ stabmon.cpp \ inputmethods.cpp \ systray.cpp \ wait.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.cpp \ $$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \ transferserver.cpp \ packageslave.cpp \ irserver.cpp \ qcopbridge.cpp \ startmenu.cpp \ main.cpp \ firstuse.cpp \ - $$(OPIEDIR)/rsync/base64.c \ - $$(OPIEDIR)/rsync/buf.c \ - $$(OPIEDIR)/rsync/checksum.c \ - $$(OPIEDIR)/rsync/command.c \ - $$(OPIEDIR)/rsync/delta.c \ - $$(OPIEDIR)/rsync/emit.c \ - $$(OPIEDIR)/rsync/hex.c \ - $$(OPIEDIR)/rsync/job.c \ - $$(OPIEDIR)/rsync/mdfour.c \ - $$(OPIEDIR)/rsync/mksum.c \ - $$(OPIEDIR)/rsync/msg.c \ - $$(OPIEDIR)/rsync/netint.c \ - $$(OPIEDIR)/rsync/patch.c \ - $$(OPIEDIR)/rsync/prototab.c \ - $$(OPIEDIR)/rsync/readsums.c \ - $$(OPIEDIR)/rsync/scoop.c \ - $$(OPIEDIR)/rsync/search.c \ - $$(OPIEDIR)/rsync/stats.c \ - $$(OPIEDIR)/rsync/stream.c \ - $$(OPIEDIR)/rsync/sumset.c \ - $$(OPIEDIR)/rsync/trace.c \ - $$(OPIEDIR)/rsync/tube.c \ - $$(OPIEDIR)/rsync/util.c \ - $$(OPIEDIR)/rsync/version.c \ - $$(OPIEDIR)/rsync/whole.c \ - $$(OPIEDIR)/rsync/qrsync.cpp \ syncdialog.cpp \ serverapp.cpp \ qprocess.cpp \ qprocess_unix.cpp \ screensaver.cpp \ $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \ mediadlg.cpp INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate DEPENDPATH += $(OPIEDIR)/core/apps/calibrate INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync DEPENDPATH += $(OPIEDIR)/rsync INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount -LIBS += -lqpe -lopiecore2 -lopieui2 +LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync TARGET = qpe contains( $(CONFIG_TARGET_MACOSX), y ) { LIBS += -lcrypt } include ( $(OPIEDIR)/include.pro ) @@ -46,96 +46,97 @@ CONFIG_EXAMPLE_MENU examples/menuapplet menuapplet.pro CONFIG_EXAMPLE_VPN examples/networksettings example.pro CONFIG_FIFTEEN noncore/games/fifteen fifteen.pro CONFIG_FILEBROWSER noncore/unsupported/filebrowser filebrowser.pro CONFIG_FLAT noncore/styles/flat flat.pro CONFIG_FORMATTER noncore/tools/formatter formatter.pro CONFIG_FREETYPE freetype freetype.pro CONFIG_FRESH noncore/styles/fresh fresh.pro CONFIG_FTPLIB noncore/net/ftplib ftplib.pro CONFIG_GO noncore/games/go go.pro CONFIG_GSMTOOL noncore/unsupported/gsmtool gsmtool.pro CONFIG_GUTENBROWSER noncore/apps/opie-gutenbrowser opie-gutenbrowser.pro CONFIG_HANDWRITING inputmethods/handwriting handwriting.pro CONFIG_HELPBROWSER core/apps/helpbrowser helpbrowser.pro CONFIG_HOMEAPPLET core/applets/homeapplet homeapplet.pro CONFIG_INTERFACES noncore/settings/networksettings/interfaces interfaces.pro CONFIG_IRDAAPPLET core/applets/irdaapplet irdaapplet.pro CONFIG_JUMPX inputmethods/jumpx jumpx.pro CONFIG_KBILL noncore/games/kbill kbill.pro CONFIG_KCHECKERS noncore/games/kcheckers kcheckers.pro CONFIG_KEYBOARD inputmethods/keyboard keyboard.pro CONFIG_KEYPEBBLE noncore/comm/keypebble keypebble.pro CONFIG_KEYVIEW development/keyview keyview.pro CONFIG_KEYZCFG noncore/apps/keyz-cfg keyz-cfg.pro CONFIG_KJUMPX inputmethods/kjumpx kjumpx.pro CONFIG_KPACMAN noncore/games/kpacman kpacman.pro CONFIG_LANGUAGE noncore/settings/language language.pro CONFIG_LAUNCHER_CORE core/launcher server.pro CONFIG_LAUNCHER-SETTINGS core/settings/launcher launcher.pro CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeg libffmpeg.pro CONFIG_LIBFLASH core/multimedia/opieplayer/libflash libflash.pro CONFIG_LIBKATE noncore/apps/tinykate/libkate libkate.pro CONFIG_LIBMAD core/multimedia/opieplayer/libmad libmad.pro CONFIG_LIBMAIL noncore/unsupported/mail2/libmail libmail.pro CONFIG_LIBMAILWRAPPER noncore/net/mail/libmailwrapper libmailwrapper.pro CONFIG_LIBMPEG3 core/multimedia/opieplayer/libmpeg3 libmpeg3.pro CONFIG_LIBOPIE2CORE libopie2/opiecore opiecore.pro CONFIG_LIBOPIE2DB libopie2/opiedb opiedb.pro CONFIG_LIBOPIE2EXAMPLES libopie2/examples examples.pro CONFIG_LIBOPIE2MM libopie2/opiemm opiemm.pro CONFIG_LIBOPIE2NET libopie2/opienet opienet.pro CONFIG_LIBOPIE2PIM libopie2/opiepim opiepim.pro CONFIG_PIMCONVERTER noncore/tools/pimconverter converter.pro CONFIG_LIBOPIE2UI libopie2/opieui opieui.pro CONFIG_LIBOPIE libopie libopie.pro CONFIG_LIBOPIE_PIM libopie/pim pim.pro CONFIG_LIBOPIETOOTH noncore/net/opietooth/lib lib.pro CONFIG_LIBQPE library library.pro CONFIG_LIBQPE-X11 x11/libqpe-x11 libqpe-x11.pro +CONFIG_LIBQRSYNC rsync rsync.pro CONFIG_LIBQTAUX libqtaux libqtaux.pro CONFIG_LIBSLCOMPAT libslcompat libslcompat.pro CONFIG_LIBSQL libsql libsql.pro CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro CONFIG_LIGHT-AND-POWER core/settings/light-and-power light-and-power.pro CONFIG_LIQUID noncore/styles/liquid liquid.pro CONFIG_LOGOUTAPPLET core/applets/logoutapplet logoutapplet.pro CONFIG_MAIL3 noncore/net/mail mail.pro CONFIG_MAILAPPLET noncore/net/mail/taskbarapplet taskbarapplet.pro CONFIG_MAILIT noncore/unsupported/mailit mailit.pro CONFIG_MAIN_TAB_EXAMPLE examples/main-tab example.pro CONFIG_MEDIUMMOUNT noncore/settings/mediummount mediummount.pro CONFIG_MEMORYAPPLET noncore/applets/memoryapplet memoryapplet.pro CONFIG_METAL noncore/styles/metal metal.pro CONFIG_MINDBREAKER noncore/games/mindbreaker mindbreaker.pro CONFIG_MINESWEEP noncore/games/minesweep minesweep.pro CONFIG_MOBILEMSG noncore/comm/mobilemsg mobilemsg.pro CONFIG_MODPLUG core/multimedia/opieplayer/modplug modplug.pro CONFIG_MULTIKEYAPPLET core/applets/multikeyapplet multikeyapplet.pro CONFIG_MULTIKEY inputmethods/multikey multikey.pro CONFIG_NETSYSTEMTIME noncore/settings/netsystemtime netsystemtime.pro CONFIG_NETWORKAPPLET noncore/applets/networkapplet networkapplet.pro CONFIG_NETWORKSETUP noncore/settings/networksettings networksettings.pro CONFIG_NOTESAPPLET noncore/applets/notesapplet notesapplet.pro CONFIG_OAPP core/apps/oapp oapp.pro CONFIG_OBEX core/applets/obex2 obex.pro CONFIG_ODICT noncore/apps/odict odict.pro CONFIG_OIPKG noncore/unsupported/oipkg oipkg.pro CONFIG_OPIEALARM core/opiealarm opiealarm.pro CONFIG_OPIE-CONSOLE noncore/apps/opie-console opie-console.pro CONFIG_OPIE_EYE noncore/graphics/opie-eye phunk_view.pro CONFIG_OPIE_EYE_SLAVE noncore/graphics/opie-eye/slave slave.pro CONFIG_OPIEFTP noncore/net/opieftp opieftp.pro CONFIG_OPIEIRC noncore/net/opieirc opieirc.pro CONFIG_OPIE-LOGIN core/opie-login opie-login.pro CONFIG_OPIEMAIL2 noncore/unsupported/mail2 mail.pro CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2 opieplayer2.pro CONFIG_OPIEPLAYER core/multimedia/opieplayer opieplayer.pro CONFIG_OPIE-RDESKTOP noncore/net/opierdesktop opierdesktop.pro CONFIG_OPIE-READER noncore/apps/opie-reader opie-reader.pro CONFIG_OPIEREC noncore/multimedia/opierec opierec.pro CONFIG_OPIE-SHEET noncore/apps/opie-sheet opie-sheet.pro CONFIG_OPIE-SH noncore/tools/opie-sh opie-sh.pro CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/applet applet.pro CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/manager manager.pro CONFIG_OPIE-WRITE noncore/apps/opie-write opie-write.pro CONFIG_OSEARCH core/pim/osearch osearch.pro diff --git a/rsync/config.in b/rsync/config.in new file mode 100644 index 0000000..d9502e4 --- a/dev/null +++ b/rsync/config.in @@ -0,0 +1,3 @@ + config LIBQRSYNC + boolean "qt rsync wrapper library" + default "y" diff --git a/rsync/rsync.pro b/rsync/rsync.pro new file mode 100644 index 0000000..a02d122 --- a/dev/null +++ b/rsync/rsync.pro @@ -0,0 +1,60 @@ +TEMPLATE = lib + +CONFIG += qt staticlib warn_on + +DESTDIR = $$(OPIEDIR)/lib + +HEADERS += \ + buf.h \ + checksum.h \ + command.h \ + emit.h \ + job.h \ + netint.h \ + protocol.h \ + prototab.h \ + rsync.h \ + search.h \ + stream.h \ + sumset.h \ + trace.h \ + types.h \ + util.h \ + whole.h \ + config_rsync.h \ + qrsync.h + +SOURCES += \ + base64.c \ + buf.c \ + checksum.c \ + command.c \ + delta.c \ + emit.c \ + hex.c \ + job.c \ + mdfour.c \ + mksum.c \ + msg.c \ + netint.c \ + patch.c \ + prototab.c \ + readsums.c \ + scoop.c \ + search.c \ + stats.c \ + stream.c \ + sumset.c \ + trace.c \ + tube.c \ + util.c \ + version.c \ + whole.c \ + qrsync.cpp + +INCLUDEPATH += $(OPIEDIR)/include + +LIBS += -lopiecore2 +TARGET = qrsync + +include ( $(OPIEDIR)/include.pro ) |