Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

Fix make builddir #1003

Merged
merged 3 commits into from
Sep 20, 2021
Merged

Fix make builddir #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33644d8
Update Makefile.am
dchassin Sep 18, 2021
4f647cc
Update Makefile.mk
dchassin Sep 18, 2021
c1f49d2
Fix build process to allow build in folders other than top source
dchassin Sep 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 19 additions & 36 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# Authors:
# DP Chassin (dchassin@slac.stanford.edu)

AM_INIT_AUTOMAKE = subdir-objects
ACLOCAL_AMFLAGS = -I m4

CC = $(PTHREAD_CC)
Expand Down Expand Up @@ -47,44 +48,28 @@ bin_PROGRAMS =
bin_SCRIPTS =
dist_doc_DATA =

python_requirements = $(top_srcdir)/requirements.txt
python_requirements = requirements.txt

docs_targets =

# required modules
include third_party/Makefile.mk
include gldcore/Makefile.mk
include python_extras/Makefile.mk
include cloud/Makefile.mk
include $(top_srcdir)/third_party/Makefile.mk
include $(top_srcdir)/gldcore/Makefile.mk
include $(top_srcdir)/python_extras/Makefile.mk
include $(top_srcdir)/cloud/Makefile.mk

# approved modules
include modules.mk
include $(top_srcdir)/modules.mk

# custom modules (see ./customize)
include custom.mk
include $(top_srcdir)/custom.mk

# for doxygen commands
include aminclude.mk
include $(top_srcdir)/aminclude.mk

dist_doc_DATA += COPYRIGHT
dist_doc_DATA += LICENSE

EXTRA_DIST += $(top_srcdir)/gldcore/gridlabd.htm
EXTRA_DIST += $(top_srcdir)/utilities/build_number

# if MISSING_XERCES
# all-local:
# @echo
# @echo " Missing dependency: libxerces-c"
# @echo ""
# @echo " libxerces-c was not found during configuration and is a required dependency."
# @echo " Install the libxerces-c development libraries and re-run ./configure or run"
# @echo " ./configure with the --with-xerces option. Try './configure --help' for"
# @echo " more information."
# @echo
# @false
# endif

help:
@echo "Configuration targets:"
@echo " reconfigure - Reconfigures a release build from a clean start"
Expand Down Expand Up @@ -157,7 +142,7 @@ over: clean all
clean-wc:
@echo -e "\nThis removes all unversioned files and directories in the working copy."
@unset REPLY && read -t 60 -p "Clean working copy (type 'yes' to proceed)? " && test "`echo "$$REPLY" | tr '[:upper:]' '[:lower:]'`" = "yes"
. utilities/cleanwc
. $(top_srcdir)/utilities/cleanwc

install-validate: install validate

Expand All @@ -175,19 +160,16 @@ $(scratchdir)/.xerces.stamp: third_party/$(XERCES_TARNAME).tar.gz
tar -xzf $< -C $(@D)
export XERCESCROOT=$(CURDIR)/$(@D)/$(XERCES_TARNAME) && \
cd $(@D)/$(XERCES_TARNAME) && \
autoreconf -isf && ./configure && make
(cd $(top_srcdir); autoreconf -isf) && $(top_srcdir)/configure && make
touch $@

$(scratchdir)/pkg: distdir # $(scratchdir)/.xerces.stamp
test ! -e $@ || rm -rf $@
test -d $@/gldcore || mkdir -p $@/gldcore
# cd $(distdir) && ./configure --with-xerces=$(CURDIR)/$(scratchdir)/$(XERCES_TARNAME) && make install DESTDIR=$(CURDIR)/$@/gldcore
cd $(distdir) && ./configure && make install DESTDIR=$(CURDIR)/$@/gldcore
cd $(distdir) && $(PWD)/configure && make install DESTDIR=$(CURDIR)/$@/gldcore
cd $@ && mkdir -p climate-data/usr/local/lib/gridlabd devel/usr/local/lib/gridlabd # libxerces-c/usr/lib
# mv $@/gldcore/usr/lib/gridlabd/*.zip $@/climate-data/usr/lib/gridlabd/
mv $@/gldcore/usr/local/include $@/devel/usr/local/include
mv $@/gldcore/usr/local/lib/gridlabd/*.la $@/devel/usr/local/lib/gridlabd/
# cp $(scratchdir)/$(XERCES_TARNAME)/src/.libs/libxerces-c.* $@/libxerces-c/usr/lib/
$(am__remove_distdir)

$(scratchdir)/$(PACKAGE_TARNAME).mpkg: $(scratchdir)/pkg
Expand Down Expand Up @@ -294,7 +276,7 @@ distclean-local: python-clean
@rm -f $(top_srcdir)/validate.txt

libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status libtool > /dev/null
$(SHELL) $(PWD)/config.status libtool > /dev/null

install-exec-hook: index python-requirements python-install docs
@cp ${top_srcdir}/{COPYRIGHT,LICENSE} $(prefix)
Expand All @@ -312,13 +294,14 @@ install-exec-hook: index python-requirements python-install docs
@echo ""

python-requirements: $(python_requirements)
cat $(python_requirements) | python3 -m pip install -q -r /dev/stdin
@echo "Updating python requirements..."
@cat $(addprefix $(top_srcdir)/,$(python_requirements)) | python3 -m pip install -q -r /dev/stdin

reconfigure: distclean
autoreconf -isf && ./configure --quiet
autoreconf -isf && $(PWD)/configure --quiet

reconfigure-debug: distclean
autoreconf -isf && ./configure --quiet 'CXXFLAGS=-O0 -g $(CXXFLAGS)'
autoreconf -isf && $(PWD)/configure --quiet 'CXXFLAGS=-O0 -g $(CXXFLAGS)'

docker: $(PREFIX)/docker.img

Expand All @@ -333,9 +316,9 @@ $(PREFIX)/docker.img: docker/Dockerfile Makefile
docker save $(PACKAGE)/$(PACKAGE_VERSION)-$(PACKAGE_BRANCH):latest -o $(prefix)/docker.img

system: install
@echo "Setting $$(./build-aux/version.sh --install) to the current system version"
@echo "Setting $$($(top_srcdir)/build-aux/version.sh --install) to the current system version"
@$(DESTDIR)$(bindir)/gridlabd version set
@if [ ! "$$(gridlabd --version=install)" == "$$(./build-aux/version.sh --install)" ]; then \
@if [ ! "$$(gridlabd --version=install)" == "$$($(top_srcdir)/build-aux/version.sh --install)" ]; then \
echo 'WARNING : build and install versions differ; run `make reconfigure` to fix this problem'; \
fi

Expand Down
4 changes: 3 additions & 1 deletion build-aux/version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/sh
# This file is used by autoconf to generate the version string.
# It is assumed that this script is run from the top-level srcdir.
FIL="gldcore/version.h"
EXE=$0
TOP=$(cd ${EXE/version.sh/..}; pwd)
FIL="${TOP}/gldcore/version.h"
MAJ=`sed -En 's/#define REV_MAJOR ([0-9]+).*/\1/p' $FIL | tr -d '\n'`
MIN=`sed -En 's/#define REV_MINOR ([0-9]+).*/\1/p' $FIL | tr -d '\n'`
PAT=`sed -En 's/#define REV_PATCH ([0-9]+).*/\1/p' $FIL | tr -d '\n'`
Expand Down
4 changes: 4 additions & 0 deletions docs/Command/Version.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ Outputs the installation path, e.g., `/usr/local/opt/gridlabd/4.2.0-191115-maste

Outputs the installation name, e.g., `gridlabd-4.2.0-191115-develop_fix_manual`.

### `git-repo`, `git-branch`, `git-commit`

Outputs the git repository URL, branch, and commit information, respectively.

# Example

The following command verifies that the version is at least 4.2:
Expand Down
154 changes: 74 additions & 80 deletions gldcore/Makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,77 +11,77 @@ dist_pkgdata_DATA += gldcore/tzinfo.txt
dist_pkgdata_DATA += gldcore/unitfile.txt
dist_pkgdata_DATA += gldcore/gridlabd.cnf

GLD_SOURCES_PLACE_HOLDER =
GLD_SOURCES_PLACE_HOLDER += gldcore/aggregate.cpp gldcore/aggregate.h
GLD_SOURCES_PLACE_HOLDER += gldcore/class.cpp gldcore/class.h
GLD_SOURCES_PLACE_HOLDER += gldcore/cmdarg.cpp gldcore/cmdarg.h
GLD_SOURCES_PLACE_HOLDER += gldcore/compare.cpp gldcore/compare.h
GLD_SOURCES_PLACE_HOLDER += gldcore/complex.h
GLD_SOURCES_PLACE_HOLDER += gldcore/console.h
GLD_SOURCES_PLACE_HOLDER += gldcore/convert.cpp gldcore/convert.h
GLD_SOURCES_PLACE_HOLDER += gldcore/curl.cpp gldcore/curl.h
GLD_SOURCES_PLACE_HOLDER += gldcore/daemon.cpp gldcore/daemon.h
GLD_SOURCES_PLACE_HOLDER += gldcore/debug.cpp gldcore/debug.h
GLD_SOURCES_PLACE_HOLDER += gldcore/deltamode.cpp gldcore/deltamode.h
GLD_SOURCES_PLACE_HOLDER += gldcore/enduse.cpp gldcore/enduse.h
GLD_SOURCES_PLACE_HOLDER += gldcore/environment.cpp gldcore/environment.h
GLD_SOURCES_PLACE_HOLDER += gldcore/exception.cpp gldcore/exception.h
GLD_SOURCES_PLACE_HOLDER += gldcore/exec.cpp gldcore/exec.h
GLD_SOURCES_PLACE_HOLDER += gldcore/find.cpp gldcore/find.h
GLD_SOURCES_PLACE_HOLDER += gldcore/gld_sock.h
GLD_SOURCES_PLACE_HOLDER += gldcore/globals.cpp gldcore/globals.h
GLD_SOURCES_PLACE_HOLDER += gldcore/gridlabd.h
GLD_SOURCES_PLACE_HOLDER += gldcore/gui.cpp gldcore/gui.h
GLD_SOURCES_PLACE_HOLDER += gldcore/http_client.cpp gldcore/http_client.h
GLD_SOURCES_PLACE_HOLDER += gldcore/index.cpp gldcore/index.h
GLD_SOURCES_PLACE_HOLDER += gldcore/instance.cpp gldcore/instance.h
GLD_SOURCES_PLACE_HOLDER += gldcore/instance_cnx.cpp gldcore/instance_cnx.h
GLD_SOURCES_PLACE_HOLDER += gldcore/instance_slave.cpp gldcore/instance_slave.h
GLD_SOURCES_PLACE_HOLDER += gldcore/interpolate.cpp gldcore/interpolate.h
GLD_SOURCES_PLACE_HOLDER += gldcore/job.cpp gldcore/job.h
GLD_SOURCES_PLACE_HOLDER += gldcore/json.cpp gldcore/json.h
GLD_SOURCES_PLACE_HOLDER += gldcore/kill.cpp gldcore/kill.h
GLD_SOURCES_PLACE_HOLDER += gldcore/kml.cpp gldcore/kml.h
GLD_SOURCES_PLACE_HOLDER += gldcore/legal.cpp gldcore/legal.h
GLD_SOURCES_PLACE_HOLDER += gldcore/linkage.cpp gldcore/linkage.h
GLD_SOURCES_PLACE_HOLDER += gldcore/link.cpp gldcore/link.h
GLD_SOURCES_PLACE_HOLDER += gldcore/list.cpp gldcore/list.h
GLD_SOURCES_PLACE_HOLDER += gldcore/load.cpp gldcore/load.h
GLD_SOURCES_PLACE_HOLDER += gldcore/loadshape.cpp gldcore/loadshape.h
GLD_SOURCES_PLACE_HOLDER += gldcore/local.cpp gldcore/local.h
GLD_SOURCES_PLACE_HOLDER += gldcore/lock.cpp gldcore/lock.h
GLD_SOURCES_PLACE_HOLDER += gldcore/main.cpp gldcore/main.h
GLD_SOURCES_PLACE_HOLDER += gldcore/match.cpp gldcore/match.h
GLD_SOURCES_PLACE_HOLDER += gldcore/matlab.cpp gldcore/matlab.h
GLD_SOURCES_PLACE_HOLDER += gldcore/module.cpp gldcore/module.h
GLD_SOURCES_PLACE_HOLDER += gldcore/object.cpp gldcore/object.h
GLD_SOURCES_PLACE_HOLDER += gldcore/output.cpp gldcore/output.h
GLD_SOURCES_PLACE_HOLDER += gldcore/platform.h
GLD_SOURCES_PLACE_HOLDER += gldcore/property.cpp gldcore/property.h
GLD_SOURCES_PLACE_HOLDER += gldcore/python_embed.cpp gldcore/python_embed.h
GLD_SOURCES_PLACE_HOLDER += gldcore/python_property.cpp gldcore/python_property.h
GLD_SOURCES_PLACE_HOLDER += gldcore/random.cpp gldcore/random.h
GLD_SOURCES_PLACE_HOLDER += gldcore/realtime.cpp gldcore/realtime.h
GLD_SOURCES_PLACE_HOLDER += gldcore/sanitize.cpp gldcore/sanitize.h
GLD_SOURCES_PLACE_HOLDER += gldcore/save.cpp gldcore/save.h
GLD_SOURCES_PLACE_HOLDER += gldcore/schedule.cpp gldcore/schedule.h
GLD_SOURCES_PLACE_HOLDER += gldcore/server.cpp gldcore/server.h
GLD_SOURCES_PLACE_HOLDER += gldcore/setup.cpp gldcore/setup.h
GLD_SOURCES_PLACE_HOLDER += gldcore/stream.cpp gldcore/stream.h
GLD_SOURCES_PLACE_HOLDER += gldcore/stream_type.h
GLD_SOURCES_PLACE_HOLDER += gldcore/test.cpp gldcore/test.h
GLD_SOURCES_PLACE_HOLDER += gldcore/threadpool.cpp gldcore/threadpool.h
GLD_SOURCES_PLACE_HOLDER += gldcore/timestamp.cpp gldcore/timestamp.h
GLD_SOURCES_PLACE_HOLDER += gldcore/transform.cpp gldcore/transform.h
GLD_SOURCES_PLACE_HOLDER += gldcore/unit.cpp gldcore/unit.h
GLD_SOURCES_PLACE_HOLDER += gldcore/validate.cpp gldcore/validate.h
GLD_SOURCES_PLACE_HOLDER += gldcore/version.cpp gldcore/version.h
GLD_SOURCES_PLACE_HOLDER += gldcore/link/python/python.cpp

GLD_SOURCES_EXTRA_PLACE_HOLDER =
GLD_SOURCES_EXTRA_PLACE_HOLDER += gldcore/cmex.c gldcore/cmex.h
GLD_SOURCES_EXTRA_PLACE_HOLDER += gldcore/ufile.c gldcore/ufile.h
GLD_SOURCES_EXTRA_PLACE_HOLDER += gldcore/xcore.cpp gldcore/xcore.h
gridlabd_bin_SOURCES =
gridlabd_bin_SOURCES += gldcore/aggregate.cpp gldcore/aggregate.h
gridlabd_bin_SOURCES += gldcore/class.cpp gldcore/class.h
gridlabd_bin_SOURCES += gldcore/cmdarg.cpp gldcore/cmdarg.h
gridlabd_bin_SOURCES += gldcore/compare.cpp gldcore/compare.h
gridlabd_bin_SOURCES += gldcore/complex.h
gridlabd_bin_SOURCES += gldcore/console.h
gridlabd_bin_SOURCES += gldcore/convert.cpp gldcore/convert.h
gridlabd_bin_SOURCES += gldcore/curl.cpp gldcore/curl.h
gridlabd_bin_SOURCES += gldcore/daemon.cpp gldcore/daemon.h
gridlabd_bin_SOURCES += gldcore/debug.cpp gldcore/debug.h
gridlabd_bin_SOURCES += gldcore/deltamode.cpp gldcore/deltamode.h
gridlabd_bin_SOURCES += gldcore/enduse.cpp gldcore/enduse.h
gridlabd_bin_SOURCES += gldcore/environment.cpp gldcore/environment.h
gridlabd_bin_SOURCES += gldcore/exception.cpp gldcore/exception.h
gridlabd_bin_SOURCES += gldcore/exec.cpp gldcore/exec.h
gridlabd_bin_SOURCES += gldcore/find.cpp gldcore/find.h
gridlabd_bin_SOURCES += gldcore/gld_sock.h
gridlabd_bin_SOURCES += gldcore/globals.cpp gldcore/globals.h
gridlabd_bin_SOURCES += gldcore/gridlabd.h
gridlabd_bin_SOURCES += gldcore/gui.cpp gldcore/gui.h
gridlabd_bin_SOURCES += gldcore/http_client.cpp gldcore/http_client.h
gridlabd_bin_SOURCES += gldcore/index.cpp gldcore/index.h
gridlabd_bin_SOURCES += gldcore/instance.cpp gldcore/instance.h
gridlabd_bin_SOURCES += gldcore/instance_cnx.cpp gldcore/instance_cnx.h
gridlabd_bin_SOURCES += gldcore/instance_slave.cpp gldcore/instance_slave.h
gridlabd_bin_SOURCES += gldcore/interpolate.cpp gldcore/interpolate.h
gridlabd_bin_SOURCES += gldcore/job.cpp gldcore/job.h
gridlabd_bin_SOURCES += gldcore/json.cpp gldcore/json.h
gridlabd_bin_SOURCES += gldcore/kill.cpp gldcore/kill.h
gridlabd_bin_SOURCES += gldcore/kml.cpp gldcore/kml.h
gridlabd_bin_SOURCES += gldcore/legal.cpp gldcore/legal.h
gridlabd_bin_SOURCES += gldcore/linkage.cpp gldcore/linkage.h
gridlabd_bin_SOURCES += gldcore/link.cpp gldcore/link.h
gridlabd_bin_SOURCES += gldcore/list.cpp gldcore/list.h
gridlabd_bin_SOURCES += gldcore/load.cpp gldcore/load.h
gridlabd_bin_SOURCES += gldcore/loadshape.cpp gldcore/loadshape.h
gridlabd_bin_SOURCES += gldcore/local.cpp gldcore/local.h
gridlabd_bin_SOURCES += gldcore/lock.cpp gldcore/lock.h
gridlabd_bin_SOURCES += gldcore/main.cpp gldcore/main.h
gridlabd_bin_SOURCES += gldcore/match.cpp gldcore/match.h
gridlabd_bin_SOURCES += gldcore/matlab.cpp gldcore/matlab.h
gridlabd_bin_SOURCES += gldcore/module.cpp gldcore/module.h
gridlabd_bin_SOURCES += gldcore/object.cpp gldcore/object.h
gridlabd_bin_SOURCES += gldcore/output.cpp gldcore/output.h
gridlabd_bin_SOURCES += gldcore/platform.h
gridlabd_bin_SOURCES += gldcore/property.cpp gldcore/property.h
gridlabd_bin_SOURCES += gldcore/python_embed.cpp gldcore/python_embed.h
gridlabd_bin_SOURCES += gldcore/python_property.cpp gldcore/python_property.h
gridlabd_bin_SOURCES += gldcore/random.cpp gldcore/random.h
gridlabd_bin_SOURCES += gldcore/realtime.cpp gldcore/realtime.h
gridlabd_bin_SOURCES += gldcore/sanitize.cpp gldcore/sanitize.h
gridlabd_bin_SOURCES += gldcore/save.cpp gldcore/save.h
gridlabd_bin_SOURCES += gldcore/schedule.cpp gldcore/schedule.h
gridlabd_bin_SOURCES += gldcore/server.cpp gldcore/server.h
gridlabd_bin_SOURCES += gldcore/setup.cpp gldcore/setup.h
gridlabd_bin_SOURCES += gldcore/stream.cpp gldcore/stream.h
gridlabd_bin_SOURCES += gldcore/stream_type.h
gridlabd_bin_SOURCES += gldcore/test.cpp gldcore/test.h
gridlabd_bin_SOURCES += gldcore/threadpool.cpp gldcore/threadpool.h
gridlabd_bin_SOURCES += gldcore/timestamp.cpp gldcore/timestamp.h
gridlabd_bin_SOURCES += gldcore/transform.cpp gldcore/transform.h
gridlabd_bin_SOURCES += gldcore/unit.cpp gldcore/unit.h
gridlabd_bin_SOURCES += gldcore/validate.cpp gldcore/validate.h
gridlabd_bin_SOURCES += gldcore/version.cpp gldcore/version.h
gridlabd_bin_SOURCES += gldcore/link/python/python.cpp

EXTRA_gridlabd_bin_SOURCES =
EXTRA_gridlabd_bin_SOURCES += gldcore/cmex.c gldcore/cmex.h
EXTRA_gridlabd_bin_SOURCES += gldcore/ufile.c gldcore/ufile.h
EXTRA_gridlabd_bin_SOURCES += gldcore/xcore.cpp gldcore/xcore.h

bin_PROGRAMS += gridlabd.bin

Expand All @@ -98,15 +98,9 @@ gridlabd_bin_LDADD += $(XERCES_LIB)
gridlabd_bin_LDADD += $(CURSES_LIB)
gridlabd_bin_LDADD += -ldl -lcurl

gridlabd_bin_SOURCES =
gridlabd_bin_SOURCES += $(GLD_SOURCES_PLACE_HOLDER)

EXTRA_gridlabd_bin_SOURCES =
EXTRA_gridlabd_bin_SOURCES += $(GLD_SOURCES_EXTRA_PLACE_HOLDER)

bin_SCRIPTS += gldcore/gridlabd

GLD_SOURCES_PLACE_HOLDER += gldcore/build.h
gridlabd_bin_SOURCES += gldcore/build.h
BUILT_SOURCES += gldcore/build.h
CLEANFILES += gldcore/build.h origin.txt

Expand Down Expand Up @@ -136,8 +130,8 @@ gldcore/gridlabd.in: gldcore/gridlabd.m4sh
gldcore/build.h: buildnum

buildnum: utilities/build_number
@/bin/bash -c "source $(top_srcdir)/utilities/build_number $(top_srcdir) gldcore/build.h"
@/bin/bash -c "source utilities/update_origin.sh" > origin.txt
@/bin/bash -c "$(top_srcdir)/utilities/build_number"
@/bin/bash -c "$(top_srcdir)/utilities/update_origin" > origin.txt

weather:
@(echo "Installing weather data manager" && mkdir -p $(prefix)/share/gridlabd/weather && chmod 2777 $(prefix)/share/gridlabd/weather && chmod 1755 $(bindir)/gridlabd-weather)
Expand Down
17 changes: 16 additions & 1 deletion gldcore/cmdarg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ int GldCmdarg::version(int argc, const char *argv[])
#else // LINUX
"Linux"
#endif
, PACKAGE_NAME, PACKAGE_VERSION, BUILDNUM, BUILD_BRANCH);
, PACKAGE_NAME, PACKAGE_VERSION, BUILDNUM, BRANCH);
return 0;
}
else if ( strcmp(opt,"number" ) == 0 || strcmp(opt,"version") == 0 )
Expand All @@ -607,10 +607,25 @@ int GldCmdarg::version(int argc, const char *argv[])
return 0;
}
else if ( strcmp(opt,"branch") == 0 )
{
output_message("%s", BRANCH);
return 0;
}
else if ( strcmp(opt,"git-branch") == 0 )
{
output_message("%s", BUILD_BRANCH);
return 0;
}
else if ( strcmp(opt,"git-repo") == 0 )
{
output_message("%s", BUILD_URL);
return 0;
}
else if ( strcmp(opt,"git-commit") == 0 )
{
output_message("%s", BUILD_ID);
return 0;
}
else if ( strcmp(opt,"platform") == 0 || strcmp(opt,"system") == 0 )
{
output_message(
Expand Down
3 changes: 2 additions & 1 deletion gldcore/link/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
srcdir = os.getenv('SRCDIR')
if not srcdir :
raise Exception("SRCDIR environment variable was not set -- try the command 'export SRCDIR=$PWD' before running setup.py")
srcdir = os.path.realpath(srcdir)

try:
from compile_options import *
Expand All @@ -46,7 +47,7 @@

from distutils.core import setup, Extension
gridlabd = Extension('gridlabd',
include_dirs = ['gldcore/link/python','gldcore'],
include_dirs = list(map(lambda x: srcdir+'/'+x,['gldcore/link/python','gldcore'])),
extra_compile_args = compile_options,
libraries = ['ncurses', 'curl'],
sources = list(map(lambda x: srcdir+'/'+x,['gldcore/link/python/python.cpp',
Expand Down
6 changes: 1 addition & 5 deletions gldcore/version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@
// SET_MYCONTEXT(DMC_VERSION) // used only if IN_MYCONTEXT is present in this module

#ifndef BRANCH
#define BRANCH "Keeler" // update this from legal.h each time trunk is branched
#error("gldcore/build.h was not updated properly (BUILDNUM is missing) - try deleting it and rebuilding again")
#endif

#ifndef BUILDNUM
#error("gldcore/build.h was not updated properly (BUILDNUM is missing) - try deleting it and rebuilding again")
#ifdef BUILD
#undef BUILD
#endif
#define BUILDNUM 0
#endif

#ifndef REV_YEAR
Expand Down
Loading