Show More
@@ -80,7 +80,7 b' let' | |||
|
80 | 80 | rhodecode-enterprise-ce = |
|
81 | 81 | let |
|
82 | 82 | version = builtins.readFile ./rhodecode/VERSION; |
|
83 |
linkNode |
|
|
83 | linkNodeAndBowerPackages = '' | |
|
84 | 84 | echo "Link node packages" |
|
85 | 85 | rm -fr node_modules |
|
86 | 86 | mkdir node_modules |
@@ -91,6 +91,13 b' let' | |||
|
91 | 91 | ln -s ${nodeDependencies}/lib/node_modules/* node_modules/ |
|
92 | 92 | |
|
93 | 93 | echo "DONE: Link node packages" |
|
94 | ||
|
95 | echo "Link bower packages" | |
|
96 | rm -fr bower_components | |
|
97 | mkdir bower_components | |
|
98 | ||
|
99 | ln -s ${bowerComponents}/bower_components/* bower_components/ | |
|
100 | echo "DONE: Link bower packages" | |
|
94 | 101 | ''; |
|
95 | 102 | in super.rhodecode-enterprise-ce.override (attrs: { |
|
96 | 103 | |
@@ -120,10 +127,13 b' let' | |||
|
120 | 127 | passthru = { |
|
121 | 128 | inherit |
|
122 | 129 | bowerComponents |
|
123 |
linkNode |
|
|
130 | linkNodeAndBowerPackages | |
|
124 | 131 | myPythonPackagesUnfix |
|
125 | 132 | pythonLocalOverrides; |
|
126 | 133 | pythonPackages = self; |
|
134 | ||
|
135 | # johbo: Legacy support for the EE build mechanisms | |
|
136 | linkNodeModules = linkNodeAndBowerPackages; | |
|
127 | 137 | }; |
|
128 | 138 | |
|
129 | 139 | LC_ALL = "en_US.UTF-8"; |
@@ -142,7 +152,7 b' let' | |||
|
142 | 152 | export PYTHONPATH="$tmp_path/${self.python.sitePackages}:$PYTHONPATH" |
|
143 | 153 | mkdir -p $tmp_path/${self.python.sitePackages} |
|
144 | 154 | python setup.py develop --prefix $tmp_path --allow-hosts "" |
|
145 |
'' + linkNode |
|
|
155 | '' + linkNodeAndBowerPackages; | |
|
146 | 156 | |
|
147 | 157 | preCheck = '' |
|
148 | 158 | export PATH="$out/bin:$PATH" |
@@ -153,7 +163,7 b' let' | |||
|
153 | 163 | rm -rf $out/lib/${self.python.libPrefix}/site-packages/rhodecode/tests |
|
154 | 164 | ''; |
|
155 | 165 | |
|
156 |
preBuild = linkNode |
|
|
166 | preBuild = linkNodeAndBowerPackages + '' | |
|
157 | 167 | grunt |
|
158 | 168 | rm -fr node_modules |
|
159 | 169 | ''; |
General Comments 0
You need to be logged in to leave comments.
Login now