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