# disable compiler optimizations and inlining
GO_GCFLAGS=-N -l
BUILD_MODE="Debug mode"
+ WEBAPP_BUILD_RULE=build
else
# optimized code without debug info
GO_LDFLAGS=-s -w
GO_GCFLAGS=
BUILD_MODE="Release mode"
+ WEBAPP_BUILD_RULE=build:prod
endif
ifeq ($(SUB_VERSION), )
cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/node_modules ./webapp/dist
webapp: webapp/install
- (cd webapp && npm run build)
+ cd webapp && npm run $(WEBAPP_BUILD_RULE)
webapp/debug:
- (cd webapp && npm run watch)
+ cd webapp && npm run watch
webapp/install:
(cd webapp && npm install)
export DESTDIR=$(DESTDIR) && export DESTDIR_WWW=$(DESTDIR_WWW) && $(ROOT_SRCDIR)/scripts/install.sh uninstall
package: clean tools/syncthing vendor build
- @mkdir -p $(PACKAGE_DIR)/xds-agent $(PACKAGE_DIR)/scripts
- @cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/xds-agent
- @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/xds-agent
- cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-agent
+ @mkdir -p $(PACKAGE_DIR)/xds-agent/www $(PACKAGE_DIR)/scripts
+ @cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/xds-agent/
+ @cp -a webapp/dist/* $(PACKAGE_DIR)/xds-agent/www/
+ @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/xds-agent/
+ @cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-agent
+ @echo "### Package $(PACKAGE_ZIPFILE) has been successfuly built - $(BUILD_MODE)"
.PHONY: package-all
package-all:
ROOT_SRCDIR=$(cd $(dirname "$0")/.. && pwd)
install() {
- mkdir -p ${DESTDIR} && cp ${ROOT_SRCDIR}/bin/* ${DESTDIR} || exit 1
- mkdir -p ${DESTDIR_WWW} && cp -a ${ROOT_SRCDIR}/webapp/dist/* ${DESTDIR_WWW} || exit 1
+ mkdir -p "${DESTDIR}" && cp "${ROOT_SRCDIR}/bin/*" "${DESTDIR}" || exit 1
+ mkdir -p "${DESTDIR_WWW}" && cp -a "${ROOT_SRCDIR}/webapp/dist/*" "${DESTDIR_WWW}" || exit 1
- cp ${ROOT_SRCDIR}/conf.d/etc/xds-agent /etc/ || exit 1
- cp ${ROOT_SRCDIR}/conf.d/etc/default/xds-agent /etc/default/ || exit 1
+ cp "${ROOT_SRCDIR}/conf.d/etc/xds-agent" /etc/ || exit 1
+ cp "${ROOT_SRCDIR}/conf.d/etc/default/xds-agent" /etc/default/ || exit 1
FILE=/etc/profile.d/xds-agent.sh
- sed -e "s;%%XDS_INSTALL_BIN_DIR%%;${DESTDIR};g" ${ROOT_SRCDIR}/conf.d/${FILE} > ${FILE} || exit 1
+ sed -e "s;%%XDS_INSTALL_BIN_DIR%%;${DESTDIR};g" "${ROOT_SRCDIR}/conf.d/${FILE}" > ${FILE} || exit 1
FILE=/usr/lib/systemd/user/xds-agent.service
- sed -e "s;/opt/AGL/xds/agent;${DESTDIR};g" ${ROOT_SRCDIR}/conf.d/${FILE} > ${FILE} || exit 1
+ sed -e "s;/opt/AGL/xds/agent;${DESTDIR};g" "${ROOT_SRCDIR}/conf.d/${FILE}" > ${FILE} || exit 1
echo ""
echo "To enable xds-agent service, execute: systemctl --user enable xds-agent"
+++ /dev/null
-import { Component, Input, ViewChild, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { FormControl, FormGroup, Validators, ValidationErrors, FormBuilder, ValidatorFn, AbstractControl } from '@angular/forms';
-
-// Import RxJs required methods
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/filter';
-import 'rxjs/add/operator/debounceTime';
-
-import { AlertService, IAlert } from '../../../@core-xds/services/alert.service';
-import { ProjectService, IProject, ProjectType, ProjectTypes } from '../../../@core-xds/services/project.service';
-import { XDSConfigService } from '../../../@core-xds/services/xds-config.service';
-
-
-@Component({
- selector: 'xds-build-settings-modal',
- templateUrl: 'build-settings-modal.component.html',
- styleUrls: ['build-settings-modal.component.scss'],
-})
-export class BuildSettingsModalComponent implements OnInit {
- // @Input('server-id') serverID: string;
- private serverID: string;
-
- cancelAction = false;
- userEditedLabel = false;
- projectTypes = ProjectTypes;
-
- addProjectForm: FormGroup;
- typeCtrl: FormControl;
- pathCliCtrl: FormControl;
- pathSvrCtrl: FormControl;
-
- constructor(
- private alert: AlertService,
- private projectSvr: ProjectService,
- private XdsConfigSvr: XDSConfigService,
- private fb: FormBuilder,
- private activeModal: NgbActiveModal,
- ) {
- // Define types (first one is special/placeholder)
- this.projectTypes.unshift({ value: ProjectType.UNSET, display: '--Select a type--' });
-
- this.typeCtrl = new FormControl(this.projectTypes[0].value, this.validatorProjType);
- this.pathCliCtrl = new FormControl('', this.validatorProjPath);
- this.pathSvrCtrl = new FormControl({ value: '', disabled: true }, this.validatorProjPath);
-
- this.addProjectForm = fb.group({
- type: this.typeCtrl,
- pathCli: this.pathCliCtrl,
- pathSvr: this.pathSvrCtrl,
- label: ['', Validators.nullValidator],
- });
- }
-
-
- ngOnInit() {
- // Update server ID
- this.serverID = this.XdsConfigSvr.getCurServer().id;
- this.XdsConfigSvr.onCurServer().subscribe(svr => this.serverID = svr.id);
-
- // Auto create label name
- this.pathCliCtrl.valueChanges
- .debounceTime(100)
- .filter(n => n)
- .map(n => {
- const last = n.split('/');
- let nm = n;
- if (last.length > 0) {
- nm = last.pop();
- if (nm === '' && last.length > 0) {
- nm = last.pop();
- }
- }
- return 'Project_' + nm;
- })
- .subscribe(value => {
- if (value && !this.userEditedLabel) {
- this.addProjectForm.patchValue({ label: value });
- }
- });
-
- // Handle disabling of Server path
- this.typeCtrl.valueChanges
- .debounceTime(500)
- .subscribe(valType => {
- const dis = (valType === String(ProjectType.SYNCTHING));
- this.pathSvrCtrl.reset({ value: '', disabled: dis });
- });
- }
-
- closeModal() {
- this.activeModal.close();
- }
-
- onKeyLabel(event: any) {
- this.userEditedLabel = (this.addProjectForm.value.label !== '');
- }
-
- onChangeLocalProject(e) {
- }
-
- onSubmit() {
- if (this.cancelAction) {
- return;
- }
-
- const formVal = this.addProjectForm.value;
-
- const type = formVal['type'].value;
- this.projectSvr.add({
- serverId: this.serverID,
- label: formVal['label'],
- pathClient: formVal['pathCli'],
- pathServer: formVal['pathSvr'],
- type: formVal['type'],
- // FIXME: allow to set defaultSdkID from New Project config panel
- })
- .subscribe(prj => {
- this.alert.info('Project ' + prj.label + ' successfully created.');
- this.closeModal();
-
- // Reset Value for the next creation
- this.addProjectForm.reset();
- const selectedType = this.projectTypes[0].value;
- this.addProjectForm.patchValue({ type: selectedType });
-
- },
- err => {
- this.alert.error(err, 60);
- this.closeModal();
- });
- }
-
- private validatorProjType(g: FormGroup): ValidationErrors | null {
- return (g.value !== ProjectType.UNSET) ? null : { validatorProjType: { valid: false } };
- }
-
- private validatorProjPath(g: FormGroup): ValidationErrors | null {
- return (g.disabled || g.value !== '') ? null : { validatorProjPath: { valid: false } };
- }
-
-}
Code Review / src / xds / xds-agent.git / commitdiff