← Back to branch summary

~nataliabidart/magicicada-server/embed-u1sync

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Magicicada Bot
  • Author(s): Natalia
  • Date: 2016-08-31 12:38:06 UTC
  • mfrom: (72.1.1 protocol-from-chicharreros)
  • Revision ID: magicicada_bot-20160831123806-thhl9tiu66ec4o7e
[r=facundo] - Use protocol from chicharreros branch.
- Branch client and protocol sourcedeps as magicicada's projects.
- Simplify folder hierarchy a bit by getting rid of the build/ dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
44
44
SOURCEDEPS_SOURCECODE_DIR = $(SOURCEDEPS_DIR)/sourcecode
45
45
TARGET_SOURCECODE_DIR = $(CURDIR)/.sourcecode
46
46
 
47
 
BUILD_DEPLOY_SOURCEDEPS=storm zope.interface ubuntuone-storage-protocol
 
47
BUILD_DEPLOY_SOURCEDEPS=magicicada-protocol
48
48
 
49
49
TESTFLAGS=
50
50
 
72
72
 
73
73
link-sourcedeps:
74
74
        @echo "Checking out external source dependencies..."
75
 
        build/link-external-sourcecode \
76
 
                -p $(SOURCEDEPS_SOURCECODE_DIR)/ \
77
 
                -t $(TARGET_SOURCECODE_DIR) \
78
 
                -c build/config-manager.txt
 
75
        dev-scripts/link-external-sourcecode -p $(SOURCEDEPS_SOURCECODE_DIR)/ \
 
76
                -t $(TARGET_SOURCECODE_DIR) -c config-manager.txt
79
77
 
80
78
# no need to link sourcedeps before building them, as rollout process
81
79
# handles config-manager.txt automatically
83
81
 
84
82
build-sourcedeps: build-deploy-sourcedeps
85
83
        @echo "Building client clientdefs.py"
86
 
        @cd .sourcecode/ubuntuone-client/ubuntuone/ && sed \
 
84
        @cd .sourcecode/magicicada-client/ubuntuone/ && sed \
87
85
                -e 's|\@localedir\@|/usr/local/share/locale|g' \
88
86
                -e 's|\@libexecdir\@|/usr/local/libexec|g' \
89
87
                -e 's|\@GETTEXT_PACKAGE\@|ubuntuone-client|g' \