bin/celeryd: Tell user to use "python -m celery.bin.celeryd" instead if running under Windows.

bin/camqadm

@@ -2,8 +2,8 @@
 import sys
 if '' not in sys.path:
     sys.path.insert(0, '')
-from celery.bin.camqadm import camqadm, parse_options
+from celery.bin import camqadm
 
 if __name__ == "__main__":
-    options, values = parse_options(sys.argv[1:])
-    sys.exit(not camqadm(*values, **vars(options)))
+    options, values = camqadm.parse_options(sys.argv[1:])
+    sys.exit(not camqadm.camqadm(*values, **vars(options)))

bin/celerybeat

@@ -1,7 +1,10 @@
 #!/usr/bin/env python
 import sys
-from celery.bin.celerybeat import run_clockservice, parse_options
+if not '' in sys.path:
+    sys.path.insert(0, '')
+
+from celery.bin import celerybeat
 
 if __name__ == "__main__":
-    options = parse_options(sys.argv[1:])
-    run_clockservice(**vars(options))
+    options = celerybeat.parse_options(sys.argv[1:])
+    celerybeat.run_clockservice(**vars(options))

bin/celeryd

@@ -1,14 +1,31 @@
 #!/usr/bin/env python
 import sys
-    if not '' in sys.path:
-sys.path.insert(0, '')
-from celery.bin.celeryd import run_worker, parse_options
+if not '' in sys.path:
+    sys.path.insert(0, '')
+from celery.bin import celeryd
+
+WINDOWS_MESSAGE = """
+
+The celeryd command does not work on Windows.
+
+Instead, please use:
+
+    ..> python -m celery.bin.celeryd
+
+You can also supply arguments:
+
+    ..> python -m celery.bin.celeryd --concurrency=10 --loglevel=DEBUG
+
+
+"""
 
 def main():
-    import multiprocessing
-    multiprocessing.freeze_support()
-    options = parse_options(sys.argv[1:])
-    run_worker(**vars(options))
+    if sys.platform == "win32":
+        print(WINDOWS_MESSAGE)
+        sys.exit()
+
+    options = celeryd.parse_options(sys.argv[1:])
+    celeryd.run_worker(**vars(options))
 
 if __name__ == "__main__":
     main()

bin/celeryinit

@@ -2,7 +2,7 @@
 import sys
 if not '' in sys.path:
     sys.path.insert(0, '')
-from celery.bin.celeryinit import main
+from celery.bin import celeryinit
 
 if __name__ == "__main__":
-    main()
+    celeryinit.main()